|
|
@@ -98,10 +98,10 @@ jobs:
|
|
|
- name: Install dependencies (macOS)
|
|
|
if: runner.os == 'macOS'
|
|
|
run: |
|
|
|
- curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
|
|
|
- tar -xf panda3d-1.10.14-tools-mac.tar.gz
|
|
|
- mv panda3d-1.10.14/thirdparty thirdparty
|
|
|
- rmdir panda3d-1.10.14
|
|
|
+ curl -O https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-mac.tar.gz
|
|
|
+ tar -xf panda3d-1.10.15-tools-mac.tar.gz
|
|
|
+ mv panda3d-1.10.15/thirdparty thirdparty
|
|
|
+ rmdir panda3d-1.10.15
|
|
|
|
|
|
# Temporary hack so that pzip can run, since we are about to remove Cg anyway.
|
|
|
install_name_tool -id "$(pwd)/thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib" thirdparty/darwin-libs-a/nvidiacg/lib/libCg.dylib
|
|
|
@@ -130,16 +130,16 @@ jobs:
|
|
|
uses: actions/cache@v4
|
|
|
with:
|
|
|
path: thirdparty
|
|
|
- key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.14-r1
|
|
|
+ key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.15-r1
|
|
|
- name: Install dependencies (Windows)
|
|
|
if: runner.os == 'Windows'
|
|
|
shell: powershell
|
|
|
run: |
|
|
|
if (!(Test-Path thirdparty/win-libs-vc14-x64)) {
|
|
|
$wc = New-Object System.Net.WebClient
|
|
|
- $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-win64.zip", "thirdparty-tools.zip")
|
|
|
+ $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-win64.zip", "thirdparty-tools.zip")
|
|
|
Expand-Archive -Path thirdparty-tools.zip
|
|
|
- Move-Item -Path thirdparty-tools/panda3d-1.10.14/thirdparty -Destination .
|
|
|
+ Move-Item -Path thirdparty-tools/panda3d-1.10.15/thirdparty -Destination .
|
|
|
}
|
|
|
|
|
|
- name: ccache (non-Windows)
|
|
|
@@ -386,16 +386,16 @@ jobs:
|
|
|
shell: powershell
|
|
|
run: |
|
|
|
$wc = New-Object System.Net.WebClient
|
|
|
- $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-win64.zip", "thirdparty-tools.zip")
|
|
|
+ $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-win64.zip", "thirdparty-tools.zip")
|
|
|
Expand-Archive -Path thirdparty-tools.zip
|
|
|
- Move-Item -Path thirdparty-tools/panda3d-1.10.14/thirdparty -Destination .
|
|
|
+ Move-Item -Path thirdparty-tools/panda3d-1.10.15/thirdparty -Destination .
|
|
|
- name: Get thirdparty packages (macOS)
|
|
|
if: runner.os == 'macOS'
|
|
|
run: |
|
|
|
- curl -O https://www.panda3d.org/download/panda3d-1.10.14/panda3d-1.10.14-tools-mac.tar.gz
|
|
|
- tar -xf panda3d-1.10.14-tools-mac.tar.gz
|
|
|
- mv panda3d-1.10.14/thirdparty thirdparty
|
|
|
- rmdir panda3d-1.10.14
|
|
|
+ curl -O https://www.panda3d.org/download/panda3d-1.10.15/panda3d-1.10.15-tools-mac.tar.gz
|
|
|
+ tar -xf panda3d-1.10.15-tools-mac.tar.gz
|
|
|
+ mv panda3d-1.10.15/thirdparty thirdparty
|
|
|
+ rmdir panda3d-1.10.15
|
|
|
(cd thirdparty/darwin-libs-a && rm -rf rocket)
|
|
|
|
|
|
- name: Set up XCode (macOS)
|
|
|
@@ -403,17 +403,14 @@ jobs:
|
|
|
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
|
|
|
|
|
|
- name: Set up Python 3.13
|
|
|
- if: runner.os != 'Windows'
|
|
|
uses: actions/setup-python@v5
|
|
|
with:
|
|
|
python-version: '3.13'
|
|
|
- name: Build Python 3.13
|
|
|
- if: runner.os != 'Windows'
|
|
|
shell: bash
|
|
|
run: |
|
|
|
python makepanda/makepanda.py --git-commit=${{github.sha}} --outputdir=built --everything --no-eigen --python-incdir="$pythonLocation/include" --python-libdir="$pythonLocation/lib" --verbose --threads=4 --windows-sdk=10 --msvc-version=14.2
|
|
|
- name: Test Python 3.13
|
|
|
- if: runner.os != 'Windows'
|
|
|
shell: bash
|
|
|
run: |
|
|
|
python -m pip install -r requirements-test.txt
|