Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FSL
conda
installer
Commits
a0b3d36b
Commit
a0b3d36b
authored
Aug 03, 2021
by
Paul McCarthy
🚵
Browse files
Merge branch 'rf/only-update-manifest-master' into 'master'
Rf/only update manifest master See merge request fsl/conda/installer!12
parents
d83afe2c
e3cf0bce
Changes
2
Hide whitespace changes
Inline
Side-by-side
.ci/update_manifest.py
View file @
a0b3d36b
...
...
@@ -84,14 +84,14 @@ def main(server=None, token=None, tag=None):
if
token
is
None
:
token
=
os
.
environ
[
'FSL_CI_API_TOKEN'
]
if
tag
is
None
:
tag
=
os
.
environ
[
'CI_COMMIT_TAG'
]
for
destination
in
[
'master'
,
'internal'
]:
branch
=
checkout_and_update_manifest
(
server
,
token
,
tag
,
destination
)
open_merge_request
(
MANIFEST_PATH
,
branch
,
MERGE_REQUEST_MSG
,
server
,
token
,
destination
)
destination
=
'master'
branch
=
checkout_and_update_manifest
(
server
,
token
,
tag
,
destination
)
open_merge_request
(
MANIFEST_PATH
,
branch
,
MERGE_REQUEST_MSG
,
server
,
token
,
destination
)
if
__name__
==
'__main__'
:
...
...
fslinstaller.py
View file @
a0b3d36b
...
...
@@ -52,7 +52,7 @@ log = logging.getLogger(__name__)
__absfile__
=
op
.
abspath
(
__file__
).
rstrip
(
'c'
)
__version__
=
'1.0.1
4
'
__version__
=
'1.0.1
5
'
"""Installer script version number. This is automatically updated
whenever a new version of the installer script is released.
"""
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment