Skip to content

Commit a9fb305

Browse files
committed
BUG: Set evaluated template directories in CI
1 parent 0acab85 commit a9fb305

File tree

2 files changed

+30
-23
lines changed

2 files changed

+30
-23
lines changed

.github/workflows/build-test-package.yml

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ jobs:
7474
- name: Evaluate template
7575
shell: bash
7676
run: |
77-
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/../ITKModuleTemplateEvaluated" "${GITHUB_WORKSPACE}"
78-
mkdir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated/.git"
77+
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/../Evaluated" "${GITHUB_WORKSPACE}"
78+
mkdir "${GITHUB_WORKSPACE}/../Evaluated/ITKModuleTemplate/.git"
7979
8080
- name: Configure CTest script
8181
shell: bash
8282
run: |
8383
operating_system="${{ matrix.os }}"
8484
cat > dashboard.cmake << EOF
8585
set(CTEST_SITE "GitHubActions")
86-
file(TO_CMAKE_PATH "${PWD}/.." CTEST_DASHBOARD_ROOT)
87-
file(TO_CMAKE_PATH "${PWD}/ITKModuleTemplateEvaluated" CTEST_SOURCE_DIRECTORY)
88-
file(TO_CMAKE_PATH "${PWD}/../build" CTEST_BINARY_DIRECTORY)
86+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
87+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../Evaluated/ITKModuleTemplate" CTEST_SOURCE_DIRECTORY)
88+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
8989
set(dashboard_source_name "${GITHUB_REPOSITORY}")
9090
if(ENV{GITHUB_REF} MATCHES "master")
9191
set(branch "-master")
@@ -154,8 +154,9 @@ jobs:
154154
- name: Evaluate template
155155
shell: bash
156156
run: |
157-
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated" "${GITHUB_WORKSPACE}"
158-
mkdir "${GITHUB_WORKSPACE}/ITKModuleTemplate/.git"
157+
python -m pip install cookiecutter
158+
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/Evaluated" "${GITHUB_WORKSPACE}"
159+
mkdir "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate/.git"
159160
160161
- name: 'Fetch build script'
161162
run: |
@@ -164,15 +165,15 @@ jobs:
164165
165166
- name: 'Build 🐍 Python 📦 package'
166167
run: |
167-
cd "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated"
168+
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
168169
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
169-
../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
170+
../../dockcross-manylinux-download-cache-and-build-module-wheels.sh cp${{ matrix.python-version }}
170171
171172
- name: Publish Python package as GitHub Artifact
172173
uses: actions/upload-artifact@v1
173174
with:
174175
name: LinuxWheel${{ matrix.python-version }}
175-
path: ITKModuleTemplateEvaluated/dist
176+
path: Evaluated/ITKModuleTemplate/dist
176177

177178
build-macos-python-packages:
178179
runs-on: macos-10.15
@@ -193,21 +194,22 @@ jobs:
193194
- name: Evaluate template
194195
shell: bash
195196
run: |
196-
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated" "${GITHUB_WORKSPACE}"
197-
mkdir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated/.git"
197+
python -m pip install cookiecutter
198+
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/Evaluated" "${GITHUB_WORKSPACE}"
199+
mkdir "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate/.git"
198200
199201
- name: 'Build 🐍 Python 📦 package'
200202
run: |
201-
cd "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated"
203+
cd "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate"
202204
export ITK_PACKAGE_VERSION=${{ matrix.itk-python-git-tag }}
203205
export MACOSX_DEPLOYMENT_TARGET=10.9
204-
../macpython-download-cache-and-build-module-wheels.sh
206+
../../macpython-download-cache-and-build-module-wheels.sh
205207
206208
- name: Publish Python package as GitHub Artifact
207209
uses: actions/upload-artifact@v1
208210
with:
209211
name: MacOSWheels
210-
path: ITKModuleTemplateEvaluated/dist
212+
path: Evaluated/ITKModuleTemplate/dist
211213

212214
build-windows-python-packages:
213215
runs-on: windows-2019
@@ -227,16 +229,21 @@ jobs:
227229
$pythonVersion = "3.${{ matrix.python-version-minor }}"
228230
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/scikit-build/scikit-ci-addons/master/windows/install-python.ps1'))
229231
232+
- uses: actions/setup-python@v2
233+
with:
234+
python-version: '3.x'
235+
230236
- name: Evaluate template
231237
shell: bash
232238
run: |
233-
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated" "${GITHUB_WORKSPACE}"
234-
mkdir "${GITHUB_WORKSPACE}/ITKModuleTemplateEvaluated/.git"
239+
python -m pip install cookiecutter
240+
python -m cookiecutter --no-input --output-dir "${GITHUB_WORKSPACE}/Evaluated" "${GITHUB_WORKSPACE}"
241+
mkdir "${GITHUB_WORKSPACE}/Evaluated/ITKModuleTemplate/.git"
235242
236243
- name: 'Fetch build dependencies'
237244
shell: bash
238245
run: |
239-
cd ITKModuleTemplate
246+
cd Evaluated/ITKModuleTemplate
240247
curl -L "https://github.com/InsightSoftwareConsortium/ITKPythonBuilds/releases/download/${{ matrix.itk-python-git-tag }}/ITKPythonBuilds-windows.zip" -o "ITKPythonBuilds-windows.zip"
241248
7z x ITKPythonBuilds-windows.zip -o/c/P -aoa -r
242249
curl -L "https://data.kitware.com/api/v1/file/5c0ad59d8d777f2179dd3e9c/download" -o "doxygen-1.8.11.windows.bin.zip"
@@ -247,7 +254,7 @@ jobs:
247254
- name: 'Build 🐍 Python 📦 package'
248255
shell: cmd
249256
run: |
250-
cd ITKModuleTemplateEvaluated
257+
cd Evaluated/ITKModuleTemplate
251258
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
252259
set PATH="C:\P\grep;%PATH%"
253260
set CC=cl.exe
@@ -258,4 +265,4 @@ jobs:
258265
uses: actions/upload-artifact@v1
259266
with:
260267
name: WindowWheel3.${{ matrix.python-version-minor }}
261-
path: ITKModuleTemplateEvaluated/dist
268+
path: Evaluated/ITKModuleTemplate/dist

{{cookiecutter.project_name}}/.github/workflows/build-test-package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ jobs:
7676
operating_system="${{ "{{" }} matrix.os {{ "}}" }}"
7777
cat > dashboard.cmake << EOF
7878
set(CTEST_SITE "GitHubActions")
79-
file(TO_CMAKE_PATH "${PWD}/.." CTEST_DASHBOARD_ROOT)
80-
file(TO_CMAKE_PATH "${PWD}/" CTEST_SOURCE_DIRECTORY)
81-
file(TO_CMAKE_PATH "${PWD}/../build" CTEST_BINARY_DIRECTORY)
79+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/.." CTEST_DASHBOARD_ROOT)
80+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/" CTEST_SOURCE_DIRECTORY)
81+
file(TO_CMAKE_PATH "\$ENV{GITHUB_WORKSPACE}/../build" CTEST_BINARY_DIRECTORY)
8282
set(dashboard_source_name "${GITHUB_REPOSITORY}")
8383
if(ENV{GITHUB_REF} MATCHES "master")
8484
set(branch "-master")

0 commit comments

Comments
 (0)