diff options
| author | Steffen Ernst <steffen.ernst@mullvad.net> | 2025-05-13 10:50:14 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2025-05-26 16:27:43 +0200 |
| commit | b6e498ad1b1d4626ad3703d5afb57a719be650e2 (patch) | |
| tree | fe53bb6771d8bd99a4ad0764b3591a31ab18c7f8 | |
| parent | d2f102e3ce6e46c46c7cd9da358e01fc272e7582 (diff) | |
| download | mullvadvpn-b6e498ad1b1d4626ad3703d5afb57a719be650e2.tar.xz mullvadvpn-b6e498ad1b1d4626ad3703d5afb57a719be650e2.zip | |
Simplify ios actions
| -rw-r--r-- | .github/actions/ios/configure-xcode/action.yml | 15 | ||||
| -rw-r--r-- | .github/actions/ios/setup-project-toolchain/action.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-creation.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/ios-screenshots-tests.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/ios-validate-build-schemas.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/ios.yml | 4 |
6 files changed, 14 insertions, 27 deletions
diff --git a/.github/actions/ios/configure-xcode/action.yml b/.github/actions/ios/configure-xcode/action.yml deleted file mode 100644 index c13dfb3eb0..0000000000 --- a/.github/actions/ios/configure-xcode/action.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: 'Setup and configure Xcode' -runs: - using: 'composite' - steps: - - name: Setup Xcode - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: '16.1' - - - name: Configure Xcode project - run: | - for file in *.xcconfig.template ; do cp $file ${file//.template/} ; done - working-directory: ios/Configurations - shell: bash -
\ No newline at end of file diff --git a/.github/actions/ios/setup-project-toolchain/action.yml b/.github/actions/ios/setup-project-toolchain/action.yml index 2b366cd3d5..3a3aede167 100644 --- a/.github/actions/ios/setup-project-toolchain/action.yml +++ b/.github/actions/ios/setup-project-toolchain/action.yml @@ -4,6 +4,7 @@ inputs: ios_rust_target: description: 'iOS target device' type: choice + default: aarch64-apple-ios-sim options: - aarch64-apple-ios-sim - aarch64-apple-ios @@ -47,5 +48,14 @@ runs: brew install protobuf shell: bash + - name: Setup Xcode + uses: maxim-lobanov/setup-xcode@v1 + with: + xcode-version: '16.1' + - name: Configure Xcode project - uses: ./.github/actions/ios/configure-xcode + run: | + for file in *.xcconfig.template ; do cp $file ${file//.template/} ; done + working-directory: ios/Configurations + shell: bash + diff --git a/.github/workflows/ios-screenshots-creation.yml b/.github/workflows/ios-screenshots-creation.yml index d226ab5121..233bb5749d 100644 --- a/.github/workflows/ios-screenshots-creation.yml +++ b/.github/workflows/ios-screenshots-creation.yml @@ -23,11 +23,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - with: - ios_rust_target: aarch64-apple-ios-sim - name: Add test account to config run: | diff --git a/.github/workflows/ios-screenshots-tests.yml b/.github/workflows/ios-screenshots-tests.yml index 17e3545fe1..ce301c3c2d 100644 --- a/.github/workflows/ios-screenshots-tests.yml +++ b/.github/workflows/ios-screenshots-tests.yml @@ -30,8 +30,6 @@ jobs: - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - with: - ios_rust_target: aarch64-apple-ios-sim - name: Add test account to config run: | diff --git a/.github/workflows/ios-validate-build-schemas.yml b/.github/workflows/ios-validate-build-schemas.yml index cfc22466a2..46d87c0077 100644 --- a/.github/workflows/ios-validate-build-schemas.yml +++ b/.github/workflows/ios-validate-build-schemas.yml @@ -28,11 +28,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - with: - ios_rust_target: aarch64-apple-ios-sim - name: Run build validation for Staging and MockRelease configurations as well as the MullvadVPNUITests target run: | diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 94cf5c4494..b174d04a10 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -54,11 +54,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - + - name: Setup project uses: ./.github/actions/ios/setup-project-toolchain - with: - ios_rust_target: aarch64-apple-ios-sim - name: Run unit tests run: | |