Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Michiel Cottaar
fslpy
Commits
f3db5a05
Commit
f3db5a05
authored
6 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
CI: Change patch_version so it just checks version
parent
cb88b49a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.ci/check_version.sh
+5
-0
5 additions, 0 deletions
.ci/check_version.sh
.ci/patch_version.sh
+0
-8
0 additions, 8 deletions
.ci/patch_version.sh
.gitlab-ci.yml
+4
-5
4 additions, 5 deletions
.gitlab-ci.yml
with
9 additions
and
13 deletions
.ci/check_version.sh
0 → 100644
+
5
−
0
View file @
f3db5a05
#!/usr/bin/env bash
set
-e
cat
fsl/version.py | egrep
"^__version__ += +'
$CI_COMMIT_REF_NAME
' *$"
This diff is collapsed.
Click to expand it.
.ci/patch_version.sh
deleted
100644 → 0
+
0
−
8
View file @
cb88b49a
#!/usr/bin/env bash
set
-e
if
[[
"x
$CI_COMMIT_TAG
"
!=
"x"
]]
;
then
echo
"Release detected - patching version -
$CI_COMMIT_REF_NAME
"
;
python
-c
"import fsl.version as v; v.patchVersion('fsl/version.py', '
$CI_COMMIT_REF_NAME
')"
;
fi
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
4
−
5
View file @
f3db5a05
...
@@ -123,16 +123,16 @@ variables:
...
@@ -123,16 +123,16 @@ variables:
###################################################
###################################################
# The
patch
_version anchor contains a before_script
# The
check
_version anchor contains a before_script
# section which is run on release builds, and makes
# section which is run on release builds, and makes
# sure that the version in the code is up to date
# sure that the version in the code is up to date
# (i.e. equal to the tag name).
# (i.e. equal to the tag name).
###################################################
###################################################
.
patch
_version
:
&
patch
_version
.
check
_version
:
&
check
_version
before_script
:
before_script
:
-
bash ./.ci/
patch
_version.sh
-
bash ./.ci/
check
_version.sh
############
############
...
@@ -191,7 +191,6 @@ style:
...
@@ -191,7 +191,6 @@ style:
build-doc
:
build-doc
:
<<
:
*only_upstream
<<
:
*only_upstream
<<
:
*patch_version
tags
:
tags
:
-
docker
-
docker
...
@@ -215,7 +214,7 @@ build-doc:
...
@@ -215,7 +214,7 @@ build-doc:
build-pypi-dist
:
build-pypi-dist
:
<<
:
*only_releases
<<
:
*only_releases
<<
:
*
patch
_version
<<
:
*
check
_version
stage
:
build
stage
:
build
image
:
python:3.6
image
:
python:3.6
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment