Skip to content

Commit

Permalink
[ci] Update to Xcode 15.3 & macos 14
Browse files Browse the repository at this point in the history
  • Loading branch information
jcelerier committed Apr 5, 2024
1 parent 1c1e3da commit 9388ddb
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 60 deletions.
11 changes: 8 additions & 3 deletions .github/actions/latest-mac-toolchain/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 14 additions & 0 deletions .github/actions/latest-msvc-toolchain/action.yml
Original file line number Diff line number Diff line change
@@ -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

18 changes: 15 additions & 3 deletions .github/actions/mac-codesign/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
17 changes: 8 additions & 9 deletions .github/workflows/libossia.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: push

jobs:
build-macos:
runs-on: macos-13
runs-on: macos-14
environment: 'Apple Certificate'
strategy:
matrix:
Expand All @@ -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 }}
Expand All @@ -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:
Expand All @@ -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
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/ossia-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/ossia-max.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/ossia-pd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/ossia-purrdata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/ossia-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/ossia-qml.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/ossia-unity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/libremidi

0 comments on commit 9388ddb

Please sign in to comment.