From 638ccab69208ebbd3185ea70072017b3fc55f983 Mon Sep 17 00:00:00 2001 From: Daniel Chick Date: Wed, 24 Jan 2024 21:45:57 -0600 Subject: [PATCH] Update CI Workflows (#956) --- .github/workflows/ci.yml | 25 ++++++++++++------------- .github/workflows/lint-pr.yaml | 4 ++-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4a997fd8..bdfb1210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,34 +20,34 @@ jobs: scheme: - "Swiftfin" - "Swiftfin tvOS" - - runs-on: macos-12 - + + runs-on: macos-13 + steps: - name: Checkout - uses: actions/checkout@v1 - + uses: actions/checkout@v4 + - name: Install SwiftGen run: brew install swiftgen - + - name: Cache Carthage - uses: actions/cache@v3 + uses: actions/cache@v4 id: carthage-cache with: path: Carthage key: ${{ runner.os }}-carthage-${{ hashFiles('**/Cartfile.resolved') }} restore-keys: ${{ runner.os }}-carthage- - + - name: Update Carthage run: carthage update --use-xcframeworks --cache-builds - + - name: Cache Swift packages - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: PackageCache key: ${{ runner.os }}-${{ matrix.scheme }}-spm-${{ hashFiles('**/Package.resolved') }} restore-keys: ${{ runner.os }}-${{ matrix.scheme }}-spm- - + - name: Build uses: nick-fields/retry@v2 with: @@ -58,5 +58,4 @@ jobs: xcodebuild build -project "Swiftfin.xcodeproj" \ -scheme "${{ matrix.scheme }}" \ -clonedSourcePackagesDirPath PackageCache \ - CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO - + CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO \ No newline at end of file diff --git a/.github/workflows/lint-pr.yaml b/.github/workflows/lint-pr.yaml index be5b73de..cb6ac410 100644 --- a/.github/workflows/lint-pr.yaml +++ b/.github/workflows/lint-pr.yaml @@ -13,11 +13,11 @@ jobs: build: name: "Lint 🧹" if: github.event.pull_request.draft == false - runs-on: macos-12 + runs-on: macos-13 steps: - name: Checkout - uses: actions/checkout@v2.3.4 + uses: actions/checkout@v4 - name: Run Swiftformat run: swiftformat . --lint --config ".swiftformat"