Skip to content

Commit 7475bc1

Browse files
authored
Fix python artifact upload (#981)
Stop using now broken `upload-artifact-as-is` action.
1 parent 91e61d6 commit 7475bc1

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

.github/workflows/windows.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ jobs:
115115
OPENGL_ES_EMULATOR_WIN: C:\Imagination\Windows_x86_64
116116
PVR_SDK_HOME: https://github.com/powervr-graphics/Native_SDK/raw/master/lib/Windows_x86_64/
117117
PYTHON: C:\hostedtoolcache\windows\Python\3.11.4\x64\python.exe
118+
PYTHON_DIST_DIR: interface/python_binding/dist
118119
# This is set to avoid the compiler running out of heap space
119120
# when vcpkg is compiling glew. Default is logical cores + 1.
120121
# Runners have 1 thread per core and 2 cores.
@@ -294,18 +295,23 @@ jobs:
294295
$KTX_VERSION = Get-Content $env:BUILD_DIR/ktx.version
295296
echo "KTX_VERSION=$KTX_VERSION" >> $env:GITHUB_ENV
296297
297-
- name: Upload Artifact
298+
# For these artifact uploads, need to take care that only one CLangCL
299+
# "package" job for each architecture produces artifacts. A second
300+
# job would attempt to upload a same-named artifact.
301+
- name: Upload artifact Install Package
298302
if: matrix.options.package == 'YES' && matrix.toolset == 'CLangCL'
299303
uses: actions/upload-artifact@v4
300304
with:
301305
name: KTX-Software-${{env.KTX_VERSION}}-Windows-${{matrix.arch}}
302306
path: ${{env.BUILD_DIR}}/KTX-Software-*.exe*
307+
compression-level: 0 # Installer already compressed.
303308

304-
- name: Upload pyktx artifacts
305-
if: matrix.options.package == 'YES' && matrix.options.py == 'ON'
306-
uses: kittaakos/upload-artifact-as-is@v0
309+
- name: Upload artifact pyktx
310+
if: matrix.options.package == 'YES' && matrix.options.py == 'ON' && matrix.toolset == 'CLangCL'
311+
uses: actions/upload-artifact@v4
307312
with:
308-
path: ${{env.BUILD_DIR}}/interface/python_binding/dist/
313+
name: pyktx-${{env.KTX_VERSION}}-Windows-${{matrix.arch}}
314+
path: ${{env.BUILD_DIR}}/${{env.PYTHON_DIST_DIR}}
309315

310316
- name: Upload to Release
311317
uses: softprops/action-gh-release@v1
@@ -315,7 +321,7 @@ jobs:
315321
prerelease: true
316322
files: |
317323
${{env.BUILD_DIR}}/KTX-Software-*.exe*
318-
${{env.BUILD_DIR}}/interface/python_binding/dist/pyktx-*
324+
${{env.BUILD_DIR}}/${{env.PYTHON_DIST_DIR}}/pyktx-*
319325
env:
320326
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
321327

0 commit comments

Comments
 (0)