From ec85a9c83db41e8897e24a0dd7f7bd2a2b4c9e64 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 13 Dec 2023 18:22:14 +0000 Subject: [PATCH 1/2] Use Xcode 15 on CI --- .github/workflows/main.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfdbd84..9f53dac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,5 @@ name: CI + on: pull_request: types: @@ -9,7 +10,7 @@ permissions: {} concurrency: group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true + cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: test: @@ -26,7 +27,7 @@ jobs: - { os: macOS, scheme: SimpleKeychain-macOS } - { os: tvOS, scheme: SimpleKeychain-tvOS } xcode: - - '14.2' + - '15.0.1' steps: - name: Checkout @@ -59,7 +60,7 @@ jobs: strategy: matrix: xcode: - - '14.2' + - '15.0.1' steps: - name: Checkout @@ -80,7 +81,7 @@ jobs: strategy: matrix: xcode: - - '14.2' + - '15.0.1' steps: - name: Checkout From 58e636c7e7e51865192b552e825b3ec4a182a9a5 Mon Sep 17 00:00:00 2001 From: Rita Zerrizuela Date: Wed, 13 Dec 2023 18:36:18 +0000 Subject: [PATCH 2/2] Use `macos-13` runner --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9f53dac..a746693 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ concurrency: jobs: test: name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }} - runs-on: macos-latest + runs-on: macos-13 env: xcodeproj: SimpleKeychain.xcodeproj @@ -55,7 +55,7 @@ jobs: test-package: name: Test Swift package using Xcode ${{ matrix.xcode }} - runs-on: macos-latest + runs-on: macos-13 strategy: matrix: @@ -76,7 +76,7 @@ jobs: pod-lint: name: Lint podspec using Xcode ${{ matrix.xcode }} - runs-on: macos-latest + runs-on: macos-13 strategy: matrix: @@ -97,7 +97,7 @@ jobs: swiftlint: name: Lint code with SwiftLint - runs-on: macos-latest + runs-on: macos-13 steps: - name: Checkout