From f90620ac85bbfc881f5d1d4d37b2d00520386e09 Mon Sep 17 00:00:00 2001 From: Bradley Mackey Date: Sun, 7 Jun 2026 14:38:12 +0100 Subject: [PATCH 1/2] Run CI_iOS on GitHub Actions --- .github/workflows/validate-all.yml | 58 ++++++++++++++++-------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/.github/workflows/validate-all.yml b/.github/workflows/validate-all.yml index a65d597c..79ddbbb8 100644 --- a/.github/workflows/validate-all.yml +++ b/.github/workflows/validate-all.yml @@ -8,7 +8,7 @@ on: branches: [main] env: - XCODE_VERSION: "26.1" + XCODE_VERSION: "26.5" jobs: release-config: @@ -51,33 +51,39 @@ jobs: path: | ~/Library/Caches/org.swift.swiftpm/repositories Vault/.build - key: ${{ runner.os }}-spm-lint-${{ hashFiles('Vault/Package.resolved') }} + key: ${{ runner.os }}-spm-lint-xcode-${{ env.XCODE_VERSION }}-${{ hashFiles('Vault/Package.resolved') }} restore-keys: | - ${{ runner.os }}-spm-lint- + ${{ runner.os }}-spm-lint-xcode-${{ env.XCODE_VERSION }}- - name: Check Linting & Formatting run: make lint - # Don't test for now to save CI time - # test: - # name: Test - # timeout-minutes: 10 - # runs-on: macos-26 - # - # steps: - # - uses: actions/checkout@v4 - # - run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer - # - # - name: Cache SPM Dependencies - # uses: actions/cache@v4 - # with: - # path: ~/Library/Caches/org.swift.swiftpm/repositories - # key: ${{ runner.os }}-spm-${{ hashFiles('Vault/Package.resolved') }} - # restore-keys: | - # ${{ runner.os }}-spm- - # - # - name: Clear SPM Artifacts - # run: rm -rf ~/Library/Caches/org.swift.swiftpm/artifacts - # - # - name: Test CI_macOS - # run: xcodebuild test -workspace Vault.xcworkspace -scheme CI_macOS -skipMacroValidation -skipPackagePluginValidation + ci-ios: + name: CI_iOS + timeout-minutes: 20 + runs-on: macos-26 + + steps: + - uses: actions/checkout@v4 + - run: sudo xcode-select -s /Applications/Xcode_${{ env.XCODE_VERSION }}.app/Contents/Developer + + - name: Log Xcode Version + run: xcodebuild -version + + - name: Cache SPM Dependencies + uses: actions/cache@v4 + with: + path: ~/Library/Caches/org.swift.swiftpm/repositories + key: ${{ runner.os }}-spm-ci-ios-xcode-${{ env.XCODE_VERSION }}-${{ hashFiles('Vault/Package.resolved') }} + restore-keys: | + ${{ runner.os }}-spm-ci-ios-xcode-${{ env.XCODE_VERSION }}- + + - name: Test CI_iOS + run: | + xcodebuild test \ + -workspace Vault.xcworkspace \ + -scheme CI_iOS \ + -testPlan iOSAllTests \ + -destination 'platform=iOS Simulator,name=iPhone 17 Pro,OS=26.5' \ + -skipMacroValidation \ + -skipPackagePluginValidation From c4320973e4616ca852be37c31c92e6b5ead20bb9 Mon Sep 17 00:00:00 2001 From: Bradley Mackey Date: Sun, 7 Jun 2026 14:53:52 +0100 Subject: [PATCH 2/2] Compile CI_iOS without running tests --- .github/workflows/validate-all.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/validate-all.yml b/.github/workflows/validate-all.yml index 79ddbbb8..52d0e713 100644 --- a/.github/workflows/validate-all.yml +++ b/.github/workflows/validate-all.yml @@ -78,9 +78,9 @@ jobs: restore-keys: | ${{ runner.os }}-spm-ci-ios-xcode-${{ env.XCODE_VERSION }}- - - name: Test CI_iOS + - name: Build CI_iOS run: | - xcodebuild test \ + xcodebuild build-for-testing \ -workspace Vault.xcworkspace \ -scheme CI_iOS \ -testPlan iOSAllTests \