|
@@ -13,8 +13,8 @@ jobs:
|
|
|
profile:
|
|
profile:
|
|
|
- ubuntu-bionic-standard-unity-makefile
|
|
- ubuntu-bionic-standard-unity-makefile
|
|
|
- ubuntu-bionic-coverage-ninja
|
|
- ubuntu-bionic-coverage-ninja
|
|
|
- - macos-eigen-coverage-unity-xcode
|
|
|
|
|
- - macos-nometa-standard-makefile
|
|
|
|
|
|
|
+ #- macos-coverage-unity-xcode
|
|
|
|
|
+ - macos-eigen-nometa-standard-makefile
|
|
|
- windows-standard-unity-msvc
|
|
- windows-standard-unity-msvc
|
|
|
- windows-nopython-nometa-standard-msvc
|
|
- windows-nopython-nometa-standard-msvc
|
|
|
|
|
|
|
@@ -39,25 +39,25 @@ jobs:
|
|
|
python: YES
|
|
python: YES
|
|
|
eigen: NO
|
|
eigen: NO
|
|
|
|
|
|
|
|
- - profile: macos-eigen-coverage-unity-xcode
|
|
|
|
|
- os: macOS-12
|
|
|
|
|
- config: Coverage
|
|
|
|
|
- unity: YES
|
|
|
|
|
- generator: Xcode
|
|
|
|
|
- compiler: Default
|
|
|
|
|
- metalibs: YES
|
|
|
|
|
- python: YES
|
|
|
|
|
- eigen: YES
|
|
|
|
|
-
|
|
|
|
|
- - profile: macos-nometa-standard-makefile
|
|
|
|
|
- os: macOS-12
|
|
|
|
|
|
|
+ #- profile: macos-coverage-unity-xcode
|
|
|
|
|
+ # os: macOS-13
|
|
|
|
|
+ # config: Coverage
|
|
|
|
|
+ # unity: YES
|
|
|
|
|
+ # generator: Xcode
|
|
|
|
|
+ # compiler: Default
|
|
|
|
|
+ # metalibs: YES
|
|
|
|
|
+ # python: YES
|
|
|
|
|
+ # eigen: NO
|
|
|
|
|
+
|
|
|
|
|
+ - profile: macos-eigen-nometa-standard-makefile
|
|
|
|
|
+ os: macOS-13
|
|
|
config: Standard
|
|
config: Standard
|
|
|
unity: NO
|
|
unity: NO
|
|
|
generator: Unix Makefiles
|
|
generator: Unix Makefiles
|
|
|
compiler: Default
|
|
compiler: Default
|
|
|
metalibs: NO
|
|
metalibs: NO
|
|
|
python: YES
|
|
python: YES
|
|
|
- eigen: NO
|
|
|
|
|
|
|
+ eigen: YES
|
|
|
|
|
|
|
|
- profile: windows-standard-unity-msvc
|
|
- profile: windows-standard-unity-msvc
|
|
|
os: windows-2022
|
|
os: windows-2022
|
|
@@ -102,6 +102,10 @@ jobs:
|
|
|
|
|
|
|
|
brew install ccache
|
|
brew install ccache
|
|
|
|
|
|
|
|
|
|
+ - name: Set up XCode (macOS)
|
|
|
|
|
+ if: runner.os == 'macOS'
|
|
|
|
|
+ run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
|
|
|
|
|
+
|
|
|
- name: Install dependencies (Ubuntu)
|
|
- name: Install dependencies (Ubuntu)
|
|
|
if: startsWith(matrix.os, 'ubuntu')
|
|
if: startsWith(matrix.os, 'ubuntu')
|
|
|
run: >
|
|
run: >
|
|
@@ -117,7 +121,7 @@ jobs:
|
|
|
|
|
|
|
|
- name: Cache dependencies (Windows)
|
|
- name: Cache dependencies (Windows)
|
|
|
if: runner.os == 'Windows'
|
|
if: runner.os == 'Windows'
|
|
|
- uses: actions/cache@v1
|
|
|
|
|
|
|
+ uses: actions/cache@v4
|
|
|
with:
|
|
with:
|
|
|
path: thirdparty
|
|
path: thirdparty
|
|
|
key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.14-r1
|
|
key: ci-cmake-${{ runner.OS }}-thirdparty-v1.10.14-r1
|
|
@@ -134,7 +138,7 @@ jobs:
|
|
|
|
|
|
|
|
- name: ccache (non-Windows)
|
|
- name: ccache (non-Windows)
|
|
|
if: runner.os != 'Windows'
|
|
if: runner.os != 'Windows'
|
|
|
- uses: actions/cache@v1
|
|
|
|
|
|
|
+ uses: actions/cache@v4
|
|
|
with:
|
|
with:
|
|
|
path: ccache
|
|
path: ccache
|
|
|
key: ci-cmake-ccache-${{ matrix.profile }}
|
|
key: ci-cmake-ccache-${{ matrix.profile }}
|
|
@@ -361,7 +365,7 @@ jobs:
|
|
|
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
|
|
if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
|
|
|
strategy:
|
|
strategy:
|
|
|
matrix:
|
|
matrix:
|
|
|
- os: [ubuntu-20.04, windows-2019, macOS-12]
|
|
|
|
|
|
|
+ os: [ubuntu-20.04, windows-2019, macOS-13]
|
|
|
runs-on: ${{ matrix.os }}
|
|
runs-on: ${{ matrix.os }}
|
|
|
steps:
|
|
steps:
|
|
|
- uses: actions/checkout@v4
|
|
- uses: actions/checkout@v4
|
|
@@ -387,6 +391,10 @@ jobs:
|
|
|
rmdir panda3d-1.10.14
|
|
rmdir panda3d-1.10.14
|
|
|
(cd thirdparty/darwin-libs-a && rm -rf rocket)
|
|
(cd thirdparty/darwin-libs-a && rm -rf rocket)
|
|
|
|
|
|
|
|
|
|
+ - name: Set up XCode (macOS)
|
|
|
|
|
+ if: runner.os == 'macOS'
|
|
|
|
|
+ run: sudo xcode-select -s /Applications/Xcode_14.3.1.app/Contents/Developer
|
|
|
|
|
+
|
|
|
- name: Set up Python 3.13
|
|
- name: Set up Python 3.13
|
|
|
if: runner.os != 'Windows'
|
|
if: runner.os != 'Windows'
|
|
|
uses: actions/setup-python@v5
|
|
uses: actions/setup-python@v5
|