Skip to content

Commit de8edb8

Browse files
authored
Merge pull request #66 from thewtex/ci-c++-python-version
ENH: Use separate ITK Git tags for C++ and Python CI
2 parents 3f27aa4 + 11d94d1 commit de8edb8

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

azure-pipelines.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ITKGitTag: v5.0.0
3-
ITKPythonPost: '.post1'
2+
ITKGitTag: 'v5.0.0'
3+
ITKPythonGitTag: 'v5.0.0.post1'
44
CMakeBuildType: Release
55

66
trigger:
@@ -174,8 +174,7 @@ jobs:
174174
175175
- script: |
176176
cd $(Agent.BuildDirectory)/ITKModuleTemplate
177-
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
178-
export ITK_PACKAGE_VERSION=$(ITKGitTag)
177+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
179178
$(Build.SourcesDirectory)/dockcross-manylinux-download-cache-and-build-module-wheels.sh
180179
displayName: 'Build Python packages'
181180
@@ -205,7 +204,7 @@ jobs:
205204
206205
- script: |
207206
cd $(Agent.BuildDirectory)/ITKModuleTemplate
208-
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
207+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
209208
$(Build.SourcesDirectory)/macpython-download-cache-and-build-module-wheels.sh
210209
displayName: 'Build Python packages'
211210
@@ -235,7 +234,7 @@ jobs:
235234
- script: |
236235
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
237236
cd $(Agent.BuildDirectory)\ITKModuleTemplate
238-
set ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
237+
set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
239238
set CC=cl.exe
240239
set CXX=cl.exe
241240
powershell.exe -file $(Build.SourcesDirectory)\windows-download-cache-and-build-module-wheels.ps1

{{cookiecutter.project_name}}/test/azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
variables:
2-
ITKGitTag: v5.0.0
3-
ITKPythonPost: '.post1'
2+
ITKGitTag: 'v5.0.0'
3+
ITKPythonGitTag: 'v5.0.0.post1'
44
CMakeBuildType: Release
55

66
trigger:
@@ -157,7 +157,7 @@ jobs:
157157
displayName: 'Fetch build script'
158158
159159
- script: |
160-
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
160+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
161161
./dockcross-manylinux-download-cache-and-build-module-wheels.sh
162162
displayName: 'Build Python packages'
163163
@@ -181,7 +181,7 @@ jobs:
181181
displayName: 'Fetch build script'
182182
183183
- script: |
184-
export ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
184+
export ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
185185
./macpython-download-cache-and-build-module-wheels.sh
186186
displayName: 'Build Python packages'
187187
@@ -205,7 +205,7 @@ jobs:
205205
206206
- script: |
207207
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
208-
set ITK_PACKAGE_VERSION=$(ITKGitTag)$(ITKPythonPost)
208+
set ITK_PACKAGE_VERSION=$(ITKPythonGitTag)
209209
set CC=cl.exe
210210
set CXX=cl.exe
211211
powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1

0 commit comments

Comments
 (0)