Skip to content

Commit

Permalink
Merge pull request #295 from privacybydesign/fix-unstable-select-xcode
Browse files Browse the repository at this point in the history
CI/CD: fix failing xcode-select after policy change in GitHub Actions MacOS runner image
  • Loading branch information
w-ensink authored Nov 15, 2024
2 parents e884b60 + 67e8447 commit 4cbb8c5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 19 deletions.
5 changes: 0 additions & 5 deletions .github/actions/setup-build-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@ description: This action installs all build tools needed for irmamobile and cach
runs:
using: composite
steps:
# The macOS runner's default XCode version changes over time, so we need to pin it to a specific version.
- name: Select Xcode version
if: runner.os == 'macOS'
run: ./ci_scripts/select_xcode.sh
shell: bash
- uses: actions/setup-java@v4
with:
distribution: temurin
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/delivery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency: ${{ github.ref }}

jobs:
build-irmagobridge-ios:
runs-on: macos-14
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
steps:
- name: Check out repository
uses: actions/checkout@v4
Expand All @@ -35,7 +35,7 @@ jobs:
path: android/irmagobridge/irmagobridge.aar
build-app-ios-alpha:
# Ad Hoc builds do not require unique build numbers, so we can build this on every push.
runs-on: macos-14
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
needs: build-irmagobridge-ios
environment: ad-hoc-alpha
steps:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
shell: bash
continue-on-error: true
build-app-ios-beta:
runs-on: macos-14
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
needs: version-check
if: needs.version-check.outputs.version-changed == 'true'
environment: app-store-beta
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/status-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: ./.github/actions/setup-build-environment
- run: bundle exec fastlane unit_test
build-irmagobridge-ios:
runs-on: macos-14 # MacOS version is pinned, because it determines which XCode version is used.
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
needs: lint
steps:
- name: Check out repository
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
name: prototypes-alpha-android
path: ./build/app/outputs/apk/alpha/release/*.apk
build-app-ios-alpha:
runs-on: macos-14 # MacOS version is pinned, because it determines which XCode version is used.
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
needs: build-irmagobridge-ios
steps:
- name: Check out repository
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
name: app-${{ matrix.flavor }}-android-${{ matrix.type }}
path: ./fastlane/build/*
build-integration-test-ios:
runs-on: macos-14 # MacOS version is pinned, because it determines which XCode version is used.
runs-on: macos-15 # MacOS version is pinned, because it determines which XCode version is used.
needs: build-irmagobridge-ios
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -220,6 +220,7 @@ jobs:
strategy:
matrix:
file_name: ${{ fromJson(needs.build-integration-test-ios.outputs.matrix) }}
fail-fast: false # To prevent we have to re-run all tests when one run is flaky.
concurrency: integration-test-ios-${{ matrix.file_name }} # To prevent that we use too much test resources at the same time.
steps:
- name: Download test artifacts
Expand Down
8 changes: 0 additions & 8 deletions ci_scripts/select_xcode.sh

This file was deleted.

0 comments on commit 4cbb8c5

Please sign in to comment.