[ci] Update to Xcode 15.3 & macos 14

ossia · Apr 5, 2024 · 9388ddb · 9388ddb
1 parent 1c1e3da
commit 9388ddb
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 60 deletions.
diff --git a/.github/actions/latest-mac-toolchain/action.yml b/.github/actions/latest-mac-toolchain/action.yml
@@ -3,6 +3,11 @@ description: 'Install Mac toolchain'
 runs:
   using: "composite"
   steps:
-    - name: Setup Xcode
-      shell: bash
-      run: sudo xcode-select -s /Applications/Xcode_15.0.app
+    - uses: maxim-lobanov/setup-xcode@v1
+      if: runner.os == 'macOS'
+      with:
+        xcode-version: latest-stable
+
+    - name: Install Dependencies
+      run: brew install ninja
+      shell: bash
diff --git a/.github/actions/latest-msvc-toolchain/action.yml b/.github/actions/latest-msvc-toolchain/action.yml
@@ -0,0 +1,14 @@
+name: 'Install MSVC toolchain'
+description: 'Install MSVC toolchain'
+runs:
+  using: "composite"
+  steps:
+    - name: Set up Visual Studio shell
+      uses: egor-tensin/vs-shell@v2
+      with:
+        arch: x64
+
+    - name: Install Dependencies
+      shell: cmd
+      run: choco install -y ninja
+
diff --git a/.github/actions/mac-codesign/action.yml b/.github/actions/mac-codesign/action.yml
@@ -6,16 +6,28 @@ inputs:
     description: 'Path containing files to sign'
     required: true
     default: ''
+  MAC_CERT_B64:
+    description: 'Certificate encoded as base64'
+    required: true
+    default: ''
+  MAC_CERT_PASSWORD:
+    description: 'Certificate password'
+    required: true
+    default: ''
+  MAC_ALTOOL_PASSWORD:
+    description: 'macOS notarization password'
+    required: true
+    default: ''
 runs:
   using: "composite"
   steps:
     - name: Code Signing
       shell: bash
 
       env:
-        MAC_CERT_B64: ${{ secrets.MAC_CERT_B64 }}
-        MAC_CERT_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
-        MAC_ALTOOL_PASSWORD: ${{ secrets.MAC_ALTOOL_PASSWORD }}
+        MAC_CERT_B64: ${{ inputs.MAC_CERT_B64 }}
+        MAC_CERT_PASSWORD: ${{ inputs.MAC_CERT_PASSWORD }}
+        MAC_ALTOOL_PASSWORD: ${{ inputs.MAC_ALTOOL_PASSWORD }}
       run: |
         # Setup codesigning
         # Thanks https://www.update.rocks/blog/osx-signing-with-travis/

diff --git a/.github/workflows/libossia.yml b/.github/workflows/libossia.yml
@@ -4,7 +4,7 @@ on: push
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     environment: 'Apple Certificate'
     strategy:
       matrix:
@@ -14,8 +14,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: brew install ninja
     - name: Build
       env: 
         STATIC: ${{ matrix.static }}
@@ -33,6 +31,12 @@ jobs:
         cmake --build build --target install
 
     - uses: ./.github/actions/mac-codesign
+      with:
+        path-to-sign: lib
+        MAC_CERT_B64: ${{ secrets.MAC_CERT_B64 }}
+        MAC_CERT_PASSWORD: ${{ secrets.MAC_CERT_PASSWORD }}
+        MAC_ALTOOL_PASSWORD: ${{ secrets.MAC_ALTOOL_PASSWORD }}
+
     - name: Archive Package
       uses: actions/upload-artifact@v2
       with:
@@ -48,13 +52,8 @@ jobs:
       fail-fast: false
     steps:
     - uses: actions/checkout@v4
-    - name: install deps
-      run: choco install -y ninja
 
-    - name: Set up Visual Studio shell
-      uses: egor-tensin/vs-shell@v2
-      with:
-        arch: x64
+    - uses: ./.github/actions/latest-msvc-toolchain
 
     - name : Build
       shell: cmd

diff --git a/.github/workflows/ossia-cpp.yml b/.github/workflows/ossia-cpp.yml
@@ -34,13 +34,10 @@ jobs:
 
   cpp-mac:
     name: CPP (macOS)
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: |
-        brew install ninja
     - name: Build
       run: |
         cmake -B build -S ${GITHUB_WORKSPACE} -GNinja -DOSSIA_CPP_ONLY=1 -DOSSIA_CI=1 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
@@ -69,13 +66,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
     - name: Build
       shell: cmd
       run: |
-        call ci\msvc.bat
-
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_CI=1 -DOSSIA_CPP_ONLY=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build
         cmake --install build

diff --git a/.github/workflows/ossia-max.yml b/.github/workflows/ossia-max.yml
@@ -4,7 +4,7 @@ on: push
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     environment: 'Apple Certificate'
     steps:
     - uses: actions/checkout@v4
@@ -81,13 +81,10 @@ jobs:
       configuration: Release
     steps:
     - uses: actions/checkout@v4
-    - name: install deps
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
     - name : build
       shell: cmd
       run: |
-        call ci\msvc.bat
-
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_MAX_ONLY=1 -DCMAKE_SYSTEM_VERSION=7 -DOSSIA_CI=1 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build
         cmake --install build

diff --git a/.github/workflows/ossia-pd.yml b/.github/workflows/ossia-pd.yml
@@ -4,7 +4,7 @@ on: push
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     environment: 'Apple Certificate'
     steps:
     - uses: actions/checkout@v4
@@ -70,13 +70,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - name: install deps
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
     - name : Build
       shell: cmd
       run: |
-        call ci\msvc.bat
-
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_PD_ONLY=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build
         cmake --install build

diff --git a/.github/workflows/ossia-purrdata.yml b/.github/workflows/ossia-purrdata.yml
@@ -4,13 +4,11 @@ on: push
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     environment: 'Apple Certificate'
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: brew install ninja
     - name: Build
       run: | 
         cmake -B build -S ${GITHUB_WORKSPACE} \
@@ -72,13 +70,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v4
-    - name: install deps
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
     - name : Build
       shell: cmd
       run: |
-        call ci\msvc.bat
-
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_PD_ONLY=1 -DOSSIA_PURR_DATA=1 -DOSSIA_CI=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build
         cmake --install build

diff --git a/.github/workflows/ossia-python.yml b/.github/workflows/ossia-python.yml
@@ -4,13 +4,11 @@ on: push
 
 jobs:
   build-macos:
-    runs-on: macos-13
+    runs-on: macos-14
     environment: 'Apple Certificate'
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: brew install ninja
     - name: Build
       run: | 
         cmake -B build -S ${GITHUB_WORKSPACE} -G Ninja \

diff --git a/.github/workflows/ossia-qml.yml b/.github/workflows/ossia-qml.yml
@@ -33,13 +33,13 @@ jobs:
 
   qml-mac:
     name: QML (macOS)
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
     - name: Install Dependencies
       run: |
-        brew install ninja qt
+        brew install qt
     - name: Build
       run: |
         cmake -B build -S ${GITHUB_WORKSPACE} -GNinja \
@@ -73,12 +73,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
     - name: Build
       shell: cmd
       run: |
-        call ci\msvc.bat
 
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_PCH=0 -DOSSIA_CI=1 -DOSSIA_QML_ONLY=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build

diff --git a/.github/workflows/ossia-unity.yml b/.github/workflows/ossia-unity.yml
@@ -29,13 +29,10 @@ jobs:
 
   Unity3DMac:
     name: Unity3D (macOS)
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: |
-        brew install ninja
     - name: Build
       run: |
         cmake -B build -S ${GITHUB_WORKSPACE} -GNinja \
@@ -93,13 +90,10 @@ jobs:
 
   Unity3DIOs:
     name: Unity3D (iOS)
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/actions/latest-mac-toolchain
-    - name: Install Dependencies
-      run: |
-        brew install ninja
     - name: Initialize iOS toolchain
       run: |
         cd ${GITHUB_WORKSPACE}
@@ -171,12 +165,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Dependencies
-      run: choco install -y ninja
+    - uses: ./.github/actions/latest-msvc-toolchain
+
     - name: Build
       shell: cmd
       run: |
-        call ci\msvc.bat
 
         cmake -B build -S %GITHUB_WORKSPACE% -GNinja -DOSSIA_CI=1 -DOSSIA_UNITY3D_ONLY=1 -DCMAKE_SYSTEM_VERSION=7 -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Release
         cmake --build build

diff --git a/3rdparty/libremidi b/3rdparty/libremidi