workflow: CI update for thirdparty, get NSIS

This commit is contained in:
rdb
2026-02-04 10:53:18 +01:00
parent ffe43b97c6
commit e68c2a934b

View File

@@ -19,7 +19,7 @@ jobs:
uses: actions/cache/restore@v5
with:
path: ./thirdparty
key: cache-thirdparty-ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa-${{ matrix.os }}
key: cache-thirdparty-7b319de3355d0e8170b8b69f38362a47042b9b9b-${{ matrix.os }}
- name: Install yasm
if: runner.os != 'Windows' && steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
@@ -27,7 +27,7 @@ jobs:
- name: Clone thirdparty repository
if: steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
run: git clone --revision=ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
run: git clone --revision=7b319de3355d0e8170b8b69f38362a47042b9b9b --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
- name: Configure
if: steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
@@ -51,6 +51,15 @@ jobs:
shell: bash
run: rm -rf build
- name: Get NSIS (Windows)
if: runner.os == 'Windows' && steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
working-directory: thirdparty
run: |
curl.exe -sLo nsis.zip "https://sourceforge.net/projects/nsis/files/NSIS%203/3.11/nsis-3.11.zip/download"
Expand-Archive nsis.zip -DestinationPath .
Rename-Item nsis-3.11 win-nsis
Remove-Item nsis.zip
- name: Get Python (Windows)
if: runner.os == 'Windows' && steps.cache-thirdparty-restore.outputs.cache-hit != 'true'
working-directory: thirdparty
@@ -188,7 +197,7 @@ jobs:
uses: actions/cache/restore@v5
with:
path: ./thirdparty
key: cache-thirdparty-ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa-${{ matrix.os }}
key: cache-thirdparty-7b319de3355d0e8170b8b69f38362a47042b9b9b-${{ matrix.os }}
fail-on-cache-miss: true
- name: ccache (non-Windows)
@@ -483,7 +492,7 @@ jobs:
uses: actions/cache/restore@v5
with:
path: ./thirdparty
key: cache-thirdparty-ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa-${{ matrix.os }}
key: cache-thirdparty-7b319de3355d0e8170b8b69f38362a47042b9b9b-${{ matrix.os }}
fail-on-cache-miss: true
- name: Configure headless OpenGL
@@ -638,12 +647,12 @@ jobs:
uses: actions/cache/restore@v5
with:
path: ./thirdparty
key: cache-emscripten-thirdparty-ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa
key: cache-emscripten-thirdparty-7b319de3355d0e8170b8b69f38362a47042b9b9b
- name: Build thirdparty packages
if: steps.cache-emscripten-thirdparty-restore.outputs.cache-hit != 'true'
run: |
git clone --revision=ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
git clone --revision=7b319de3355d0e8170b8b69f38362a47042b9b9b --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
cd thirdparty
emcmake cmake -B build -DCMAKE_BUILD_TYPE=Release -DDISABLE_ALL=ON -DBUILD_GLSLANG=ON -DBUILD_SPIRV_CROSS=ON -DBUILD_SPIRV_TOOLS=ON
cmake --build build --config Release -j4
@@ -752,7 +761,7 @@ jobs:
uses: actions/cache/restore@v5
with:
path: ./thirdparty
key: cache-android-thirdparty-ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa-${{ matrix.android-abi }}-ndk${{ matrix.ndk-version }}
key: cache-android-thirdparty-7b319de3355d0e8170b8b69f38362a47042b9b9b-${{ matrix.android-abi }}-ndk${{ matrix.ndk-version }}
- name: Install yasm
if: steps.cache-android-thirdparty-restore.outputs.cache-hit != 'true'
@@ -761,7 +770,7 @@ jobs:
- name: Build thirdparty packages
if: steps.cache-android-thirdparty-restore.outputs.cache-hit != 'true'
run: |
git clone --revision=ad5c35eafe6b8aefe58444ed7343a421fe8fcfaa --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
git clone --revision=7b319de3355d0e8170b8b69f38362a47042b9b9b --depth=1 https://github.com/rdb/panda3d-thirdparty.git thirdparty
cd thirdparty
cmake -B build \
-DCMAKE_BUILD_TYPE=Release \