Update yml.

wrkstrm · Jun 25, 2024 · 3ae2f54 · 3ae2f54
1 parent 8b2595d
commit 3ae2f54
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/wrkstrm-color-swift.yml b/.github/workflows/wrkstrm-color-swift.yml
@@ -1,19 +1,19 @@
 name: "\U0001F3CE️ Swift Build| WrkstrmColor"
 on:
+  pull_request:
+    branches:
+    - main
   push:
     branches:
     - main
     paths:
     - '**'
-  pull_request:
-    branches:
-    - main
 jobs:
   swift-build:
     strategy:
       matrix:
         os:
-        - macos-13
+        - macos-14
         - ubuntu-latest
     runs-on: ${{ matrix.os }}
     steps:
@@ -22,19 +22,19 @@ jobs:
         submodules: recursive
     - name: Cache SPM dependencies
       id: cache-spm
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         restore-keys: ${{ runner.os }}-spm-WrkstrmColor-
+        path: apple/WrkstrmColor/.build
         key: ${{ runner.os }}-spm-WrkstrmColor-${{ hashFiles('**/Package.resolved')
           }}
-        path: apple/WrkstrmColor/.build
     - name: Check Cache
       run: 'echo ''Cache hit: ${{ steps.cache-spm.outputs.cache-hit }}'''
     - name: Setup Xcode
       uses: maxim-lobanov/setup-xcode@v1
-      if: matrix.os == 'macos-latest' || matrix.os == 'macos-13' || matrix.os == 'self-hosted'
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-14' || matrix.os == 'self-hosted'
       with:
-        xcode-version: '15.0'
+        xcode-version: '15.3'
     - name: Swift Describe
       if: steps.cache-spm.outputs.cache-hit != 'true'
       run: swift package describe --type json

diff --git a/.github/workflows/wrkstrm-color-swiftlint.yml b/.github/workflows/wrkstrm-color-swiftlint.yml
@@ -13,34 +13,37 @@ jobs:
     strategy:
       matrix:
         os:
-        - macos-13
+        - macos-14
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: recursive
     - name: Cache Homebrew dependencies
       id: cache-brew
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
-        key: ${{ runner.os }}-homebrew-${{ hashFiles('**/Brewfile') }
+        key: ${{ runner.os }}-homebrew-${{ hashFiles('**/Brewfile') }}
         path: /usr/local/Homebrew ~/Library/Caches/Homebrew
     - name: Check Cache
       run: 'echo ''Cache hit: ${{ steps.cache-brew.outputs.cache-hit }}'''
     - name: Setup Xcode
       uses: maxim-lobanov/setup-xcode@v1
-      if: matrix.os == 'macos-latest' || matrix.os == 'macos-13' || matrix.os == 'self-hosted'
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-14' || matrix.os == 'self-hosted'
       with:
-        xcode-version: '15.0'
+        xcode-version: '15.3'
     - name: Set CI Style
       run: echo "SPM_CI_USE_LOCAL_DEPS=false" >> $GITHUB_ENV
     - name: Check CI Style
       run: '[ -z "${SPM_CI_USE_LOCAL_DEPS}" ] && echo "SPM_CI_LOCAL_DEPS is not set"
         || echo "SPM_CI_USE_LOCAL_DEPS is set to ${SPM_CI_USE_LOCAL_DEPS}"'
       env:
         SPM_CI_USE_LOCAL_DEPS: ${{ env.SPM_CI_USE_LOCAL_DEPS }}
-    - name: Swift SWIFTLINT
+    - name: brew install swiftlint
       if: steps.cache-brew.outputs.cache-hit != 'true'
       run: brew install swiftlint
+    - name: Download SwiftLint Configuration
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-14'
+      run: curl -O https://raw.githubusercontent.com/wrkstrm/WrkstrmConfig/main/.swiftlint.yml
     - name: SwiftLint
       run: swiftlint