From 1cd3031448a36bddd6af631046057922df2fc837 Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Fri, 20 Oct 2023 10:00:01 -0700 Subject: [PATCH 1/2] Update CI to macOS 13 + Xcode 15.0 Also manually install `colima` to start up Docker since these runners no longer include it out of the box. --- .github/workflows/ci.yaml | 28 ++++++++++++++-------------- .github/workflows/release.yml | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 11cc38c5..2856a4ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,39 +9,39 @@ permissions: contents: read jobs: build-connect-library: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode - run: sudo xcode-select --switch /Applications/Xcode_14.1.app + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Connect library run: make buildpackage build-eliza-cocoapods-example: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode - run: sudo xcode-select --switch /Applications/Xcode_14.1.app + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Eliza CocoaPods example run: | cd Examples/ElizaCocoaPodsApp pod install xcodebuild -workspace ElizaCocoaPodsApp.xcworkspace -scheme ElizaCocoaPodsApp build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO build-eliza-swiftpm-example: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode - run: sudo xcode-select --switch /Applications/Xcode_14.1.app + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Eliza Swift PM example run: | cd Examples/ElizaSwiftPackageApp xcodebuild -scheme ElizaSwiftPackageApp build CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO build-plugin-and-generate: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - uses: bufbuild/buf-setup-action@v1.27.0 @@ -56,16 +56,16 @@ jobs: git update-index --refresh --add --remove git diff-index --quiet HEAD -- run-connect-tests: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md#xcode - run: sudo xcode-select --switch /Applications/Xcode_14.1.app + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Set up docker (missing on macOS GitHub runners) # https://github.com/actions/runner-images/issues/2150 run: | - brew install docker + brew install docker colima colima start - name: Run tests run: make test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8827d3d2..e8ae7c0f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ permissions: contents: write jobs: release: - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - uses: bufbuild/buf-setup-action@v1.27.0 From 480bd38a0943ec71cf726e05c287110debb23fda Mon Sep 17 00:00:00 2001 From: Michael Rebello Date: Fri, 20 Oct 2023 10:02:06 -0700 Subject: [PATCH 2/2] Update ci.yaml --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2856a4ed..be46cf51 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Connect library run: make buildpackage @@ -22,7 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Eliza CocoaPods example run: | @@ -34,7 +34,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Build Eliza Swift PM example run: | @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Select Xcode version - # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-arm64-Readme.md#xcode + # https://github.com/actions/runner-images/blob/main/images/macos/macos-13-Readme.md#xcode run: sudo xcode-select --switch /Applications/Xcode_15.0.app - name: Set up docker (missing on macOS GitHub runners) # https://github.com/actions/runner-images/issues/2150