Merge branch 'release/6.0.3'

sinoru · May 9, 2022 · 2b481ad · 2b481ad
2 parents a95cd16 + 9d440bc
commit 2b481ad
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -66,6 +66,7 @@ jobs:
       - run: |
           export SWIFTLINT_PATH="$(cd ${{ github.workspace }} && pwd -L)/SwiftLint"
 
+          echo SWIFTLINT_OS_VERSION_HASH="$(uname -prsv | openssl dgst -sha256 -binary | xxd -p -c 256)" >> $GITHUB_ENV
           echo SWIFTLINT_PATH="$SWIFTLINT_PATH" >> $GITHUB_ENV
           echo SWIFTLINT_PACKAGE_ARGS="--package-path "$SWIFTLINT_PATH" -c release --manifest-cache local --disable-index-store --use-integrated-swift-driver" >> $GITHUB_ENV
       - uses: actions/checkout@v3
@@ -77,11 +78,10 @@ jobs:
         id: cache
         with:
           path: '${{ env.SWIFTLINT_PATH }}/.build'
-          key: sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-${{ env.SWIFTLINT_VERSION }}-${{ hashFiles('${{ env.SWIFTLINT_PATH }}/Package.*') }}
+          key: sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-${{ env.SWIFT_VERSION }}-${{ inputs.swiftlint-version }}
           restore-keys: |
-            sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-${{ env.SWIFTLINT_VERSION }}-
-            sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-
-            sinoru-actions-swiftlint-${{ runner.os }}-swift-
+            sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-${{ env.SWIFT_VERSION }}-
+            sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-
       - name: swift build
         run: swift build $SWIFTLINT_PACKAGE_ARGS
 

diff --git a/README.md b/README.md
@@ -25,17 +25,17 @@ jobs:
         with:
           swift-version: '5.6.1'
       - name: GitHub Actions for SwiftLint
-        uses: sinoru/actions-swiftlint@v5
+        uses: sinoru/actions-swiftlint@v6
       - name: GitHub Actions for SwiftLint with --strict
-        uses: sinoru/actions-swiftlint@v5
+        uses: sinoru/actions-swiftlint@v6
         with:
           swiftlint-args: --strict
       - name: GitHub Actions for SwiftLint (Only files changed in the PR)
-        uses: sinoru/actions-swiftlint@v5
+        uses: sinoru/actions-swiftlint@v6
         env:
           DIFF_BASE: ${{ github.base_ref }}
       - name: GitHub Actions for SwiftLint (Different working directory)
-        uses: sinoru/actions-swiftlint@v5
+        uses: sinoru/actions-swiftlint@v6
         with:
           working-directory: Sources
 ```
diff --git a/action.yml b/action.yml
@@ -23,7 +23,8 @@ runs:
   steps:
     - run: |
         export SWIFTLINT_PATH="$(cd ${{ github.action_path }} && pwd -L)/SwiftLint"
-
+        
+        echo SWIFTLINT_OS_VERSION_HASH="$(uname -prsv | openssl dgst -sha256 -binary | xxd -p -c 256)" >> $GITHUB_ENV
         echo SWIFTLINT_PATH="$SWIFTLINT_PATH" >> $GITHUB_ENV
         echo SWIFTLINT_PACKAGE_ARGS="--package-path "$SWIFTLINT_PATH" -c release --manifest-cache local --disable-index-store --use-integrated-swift-driver" >> $GITHUB_ENV
       shell: bash
@@ -33,11 +34,10 @@ runs:
       id: cache
       with:
         path: '${{ env.SWIFTLINT_PATH }}/.build'
-        key: sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-${{ inputs.swiftlint-version }}-${{ hashFiles('${{ env.SWIFTLINT_PATH }}/Package.*') }}
+        key: sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-${{ env.SWIFT_VERSION }}-${{ inputs.swiftlint-version }}
         restore-keys: |
-          sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-${{ inputs.swiftlint-version }}-
-          sinoru-actions-swiftlint-${{ runner.os }}-swift-${{ env.SWIFT_VERSION }}-
-          sinoru-actions-swiftlint-${{ runner.os }}-swift-
+          sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-${{ env.SWIFT_VERSION }}-
+          sinoru-actions-swiftlint-${{ runner.os }}-${{ env.SWIFTLINT_OS_VERSION_HASH }}-swift-
     - name: swift build
       if: steps.cache.outputs.cache-hit != 'true'
       run: swift package --package-path "$SWIFTLINT_PATH" reset && swift build $SWIFTLINT_PACKAGE_ARGS --product swiftlint