TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

workflow: Fix issues with Continuous Integration build

Browse Source
This commit is contained in:
rdb 2020-11-17 21:58:38 +01:00
parent ac089658f3
commit 07be2e64bd
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.github/workflows/ci.yml vendored
View File

@ -92,13 +92,19 @@ jobs:
- name: Install dependencies (macOS) - name: Install dependencies (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
curl -O https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-mac.tar.gz curl -O https://www.panda3d.org/download/panda3d-1.10.7/panda3d-1.10.7-tools-mac.tar.gz
tar -xf panda3d-1.10.5-tools-mac.tar.gz tar -xf panda3d-1.10.7-tools-mac.tar.gz
mv panda3d-1.10.7/thirdparty thirdparty
rmdir panda3d-1.10.7
mkdir -p build/Frameworks
cp -R thirdparty/darwin-libs-a/nvidiacg/Cg.framework build/Frameworks/Cg.framework
mkdir -p "build/${{ matrix.config }}/Frameworks"
cp -R thirdparty/darwin-libs-a/nvidiacg/Cg.framework "build/${{ matrix.config }}/Frameworks/Cg.framework"
brew install ccache brew install ccache
echo "thirdpartyOption=-D THIRDPARTY_DIRECTORY=../panda3d-1.10.5/thirdparty -DHAVE_CG=OFF" >> $GITHUB_ENV
- name: Install dependencies (Ubuntu) - name: Install dependencies (Ubuntu)
if: startsWith(matrix.os, 'ubuntu') if: startsWith(matrix.os, 'ubuntu')
run: > run: >
@ -120,20 +126,19 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
uses: actions/cache@v1 uses: actions/cache@v1
with: with:
path: thirdparty-tools path: thirdparty
key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.5-r1 key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.7-r1
- name: Install dependencies (Windows) - name: Install dependencies (Windows)
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: powershell shell: powershell
run: | run: |
if (!(Test-Path thirdparty-tools/panda3d-1.10.5)) { if (!(Test-Path thirdparty/win-libs-vc14-x64)) {
$wc = New-Object System.Net.WebClient $wc = New-Object System.Net.WebClient
$wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-win64.zip", "thirdparty-tools.zip") $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.7/panda3d-1.10.7-tools-win64.zip", "thirdparty-tools.zip")
Expand-Archive -Path thirdparty-tools.zip Expand-Archive -Path thirdparty-tools.zip
Move-Item -Path thirdparty-tools/panda3d-1.10.7/thirdparty -Destination .
} }
echo "thirdpartyOption=-D THIRDPARTY_DIRECTORY=../thirdparty-tools/panda3d-1.10.5/thirdparty" >> $GITHUB_ENV
- name: ccache (non-Windows) - name: ccache (non-Windows)
if: runner.os != 'Windows' if: runner.os != 'Windows'
uses: actions/cache@v1 uses: actions/cache@v1
@ -146,15 +151,15 @@ jobs:
env: env:
CMAKE_GENERATOR: "${{ matrix.generator }}" CMAKE_GENERATOR: "${{ matrix.generator }}"
run: > run: >
mkdir build mkdir -p build
cd build cd build
if ${{ matrix.compiler == 'Clang' }}; then if ${{ matrix.compiler == 'Clang' }}; then
if [[ "$CMAKE_GENERATOR" == *Studio*2019* ]]; then if [[ "$CMAKE_GENERATOR" == *Studio*2019* ]]; then
export CMAKE_GENERATOR_TOOLSET=ClangCL thirdpartyOption="$thirdpartyOption -DHAVE_HARFBUZZ=NO" export CMAKE_GENERATOR_TOOLSET=ClangCL
elif [[ "$CMAKE_GENERATOR" == *Studio* ]]; then elif [[ "$CMAKE_GENERATOR" == *Studio* ]]; then
export CMAKE_GENERATOR_TOOLSET=LLVM thirdpartyOption="$thirdpartyOption -DHAVE_HARFBUZZ=NO" export CMAKE_GENERATOR_TOOLSET=LLVM
else else
export CC=clang CXX=clang++ export CC=clang CXX=clang++
fi fi
@ -173,7 +178,6 @@ jobs:
-D BUILD_METALIBS=${{ matrix.metalibs }} -D BUILD_METALIBS=${{ matrix.metalibs }}
-D HAVE_PYTHON=${{ matrix.python }} -D HAVE_PYTHON=${{ matrix.python }}
-D HAVE_EIGEN=${{ matrix.eigen }} -D HAVE_EIGEN=${{ matrix.eigen }}
${thirdpartyOption:-}
.. ..
- name: Build (no Python) - name: Build (no Python)
@ -314,16 +318,16 @@ jobs:
shell: powershell shell: powershell
run: | run: |
$wc = New-Object System.Net.WebClient $wc = New-Object System.Net.WebClient
$wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-win64.zip", "thirdparty-tools.zip") $wc.DownloadFile("https://www.panda3d.org/download/panda3d-1.10.7/panda3d-1.10.7-tools-win64.zip", "thirdparty-tools.zip")
Expand-Archive -Path thirdparty-tools.zip Expand-Archive -Path thirdparty-tools.zip
Move-Item -Path thirdparty-tools/panda3d-1.10.5/thirdparty -Destination . Move-Item -Path thirdparty-tools/panda3d-1.10.7/thirdparty -Destination .
- name: Get thirdparty packages (macOS) - name: Get thirdparty packages (macOS)
if: runner.os == 'macOS' if: runner.os == 'macOS'
run: | run: |
curl -O https://www.panda3d.org/download/panda3d-1.10.5/panda3d-1.10.5-tools-mac.tar.gz curl -O https://www.panda3d.org/download/panda3d-1.10.7/panda3d-1.10.7-tools-mac.tar.gz
tar -xf panda3d-1.10.5-tools-mac.tar.gz tar -xf panda3d-1.10.7-tools-mac.tar.gz
mv panda3d-1.10.5/thirdparty thirdparty mv panda3d-1.10.7/thirdparty thirdparty
rmdir panda3d-1.10.5 rmdir panda3d-1.10.7
(cd thirdparty/darwin-libs-a && rm -rf rocket) (cd thirdparty/darwin-libs-a && rm -rf rocket)
- name: Set up Python 3.8 - name: Set up Python 3.8
uses: actions/setup-python@v1 uses: actions/setup-python@v1