Skip to content

Commit b940685

Browse files
authored
Merge pull request #60 from thewtex/cookiecutter-evaluation
BUG: Fix Azure Build.SourcesDirectory variable name
2 parents b4c35e5 + a45db94 commit b940685

File tree

1 file changed

+34
-11
lines changed

1 file changed

+34
-11
lines changed

azure-pipelines.yml

Lines changed: 34 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
python -m pip install --upgrade pip
5454
python -m pip install --upgrade setuptools
5555
python -m pip install scikit-ci-addons
56+
python -m pip install cookiecutter
5657
python -m pip install ninja
5758
displayName: 'Install build dependencies'
5859
@@ -74,10 +75,9 @@ jobs:
7475
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITK/dashboard/itk_common.cmake -O
7576
displayName: 'Fetch CTest driver script'
7677
77-
- script: |
78-
python -m pip install cookiecutter
79-
cd /
80-
python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory)/ITKModuleTemplate $(Agent.SourcesDirectory)
78+
- bash: |
79+
python -m cookiecutter --no-input --output-dir "$(Agent.BuildDirectory)" "$(Build.SourcesDirectory)"
80+
mkdir "$(Agent.BuildDirectory)/ITKModuleTemplate/.git"
8181
displayName: 'Evaluate template'
8282
8383
- bash: |
@@ -136,7 +136,7 @@ jobs:
136136
sudo pip3 install --upgrade pip
137137
sudo pip3 install --upgrade setuptools
138138
sudo pip3 install scikit-ci-addons
139-
ci_addons ctest_junit_formatter $(Agent.BuildDirectory)/build > $(Agent.BuildDirectory)/JUnitTestResults.xml
139+
ci_addons ctest_junit_formatter "$(Agent.BuildDirectory)/build" > "$(Agent.BuildDirectory)/JUnitTestResults.xml"
140140
condition: succeededOrFailed()
141141
displayName: 'Format CTest output in JUnit format'
142142
@@ -161,15 +161,26 @@ jobs:
161161
chmod u+x dockcross-manylinux-download-cache-and-build-module-wheels.sh
162162
displayName: 'Fetch build script'
163163
164+
- task: UsePythonVersion@0
165+
inputs:
166+
versionSpec: '3.7'
167+
architecture: 'x64'
168+
164169
- script: |
170+
python -m pip install cookiecutter
171+
python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
172+
displayName: 'Evaluate template'
173+
174+
- script: |
175+
cd $(Agent.BuildDirectory)/ITKModuleTemplate
165176
export ITK_PACKAGE_VERSION=$(ITKGitTag)
166-
./dockcross-manylinux-download-cache-and-build-module-wheels.sh
177+
$(Build.SourcesDirectory)/dockcross-manylinux-download-cache-and-build-module-wheels.sh
167178
displayName: 'Build Python packages'
168179
169180
- task: PublishPipelineArtifact@0
170181
inputs:
171182
artifactName: 'LinuxWheels'
172-
targetPath: './dist'
183+
targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
173184

174185

175186
- job: 'PackageMacOS'
@@ -186,14 +197,20 @@ jobs:
186197
displayName: 'Fetch build script'
187198
188199
- script: |
200+
python -m pip install cookiecutter
201+
python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
202+
displayName: 'Evaluate template'
203+
204+
- script: |
205+
cd $(Agent.BuildDirectory)/ITKModuleTemplate
189206
export ITK_PACKAGE_VERSION=$(ITKGitTag)
190-
./macpython-download-cache-and-build-module-wheels.sh
207+
$(Build.SourcesDirectory)/macpython-download-cache-and-build-module-wheels.sh
191208
displayName: 'Build Python packages'
192209
193210
- task: PublishPipelineArtifact@0
194211
inputs:
195212
artifactName: 'MacOSWheels'
196-
targetPath: './dist'
213+
targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'
197214

198215

199216
- job: 'PackageWindows'
@@ -208,15 +225,21 @@ jobs:
208225
curl -L https://raw.githubusercontent.com/InsightSoftwareConsortium/ITKPythonPackage/master/scripts/windows-download-cache-and-build-module-wheels.ps1 -O
209226
displayName: 'Fetch build script'
210227
228+
- script: |
229+
python -m pip install cookiecutter
230+
python -m cookiecutter --no-input --output-dir $(Agent.BuildDirectory) $(Build.SourcesDirectory)
231+
displayName: 'Evaluate template'
232+
211233
- script: |
212234
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
235+
cd $(Agent.BuildDirectory)\ITKModuleTemplate
213236
set ITK_PACKAGE_VERSION=$(ITKGitTag)
214237
set CC=cl.exe
215238
set CXX=cl.exe
216-
powershell.exe -file .\windows-download-cache-and-build-module-wheels.ps1
239+
powershell.exe -file $(Build.SourcesDirectory)\windows-download-cache-and-build-module-wheels.ps1
217240
displayName: 'Build Python packages'
218241
219242
- task: PublishPipelineArtifact@0
220243
inputs:
221244
artifactName: 'WindowsWheels'
222-
targetPath: './dist'
245+
targetPath: '$(Agent.BuildDirectory)/ITKModuleTemplate/dist'

0 commit comments

Comments
 (0)