From ab80965e8907e17351aa102cb67c58db8e257a0e Mon Sep 17 00:00:00 2001 From: SirLynix Date: Sat, 30 Apr 2022 15:18:39 +0200 Subject: [PATCH] CI: Fix package key --- .github/workflows/coverage.yml | 6 +++--- .github/workflows/linux-build.yml | 4 ++-- .github/workflows/macos-build.yml | 4 ++-- .github/workflows/msys2-build.yml | 6 +++--- .github/workflows/windows-build.yml | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index cfe703727..9eb69f1bb 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Get current date as package key id: pkg_key - run: echo "::set-output name=key::$(date +'%w')" + run: echo "::set-output name=key::$(date +'%W')" - name: Checkout repository uses: actions/checkout@v3 @@ -72,7 +72,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.config.arch }}-debug-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: Linux-${{ matrix.config.arch }}-debug-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Cache xmake dependencies - name: Retrieve cached xmake dependencies (Windows) @@ -80,7 +80,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages - key: MSVC-${{ matrix.config.arch }}-releasedbg-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: MSVC-${{ matrix.config.arch }}-releasedbg-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index c4f299179..06bb9826a 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Get current date as package key id: pkg_key - run: echo "::set-output name=key::$(date +'%w')" + run: echo "::set-output name=key::$(date +'%W')" - name: Checkout repository uses: actions/checkout@v3 @@ -64,7 +64,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: Linux-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index c448fc5ac..a2a2447a2 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Get current date as package key id: pkg_key - run: echo "::set-output name=key::$(date +'%w')" + run: echo "::set-output name=key::$(date +'%W')" - name: Checkout repository uses: actions/checkout@v3 @@ -58,7 +58,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: macOS-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index de5ecfb9d..1aaf56543 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -34,7 +34,7 @@ jobs: steps: - name: Get current date as package key id: pkg_key - run: echo "::set-output name=key::$(date +'%w')" + run: echo "::set-output name=key::$(date +'%W')" - name: Checkout repository uses: actions/checkout@v3 @@ -56,7 +56,7 @@ jobs: id: xmake_cache with: path: ${{ github.workspace }}/xmake_git - key: MinGW-XMake-${{ steps.pkg_key.outputs.key }} + key: MinGW-XMake-W${{ steps.pkg_key.outputs.key }} # Build xmake - name: Setup xmake @@ -87,7 +87,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: MinGW-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml index 8155b6643..1e11a0cbd 100644 --- a/.github/workflows/windows-build.yml +++ b/.github/workflows/windows-build.yml @@ -29,7 +29,7 @@ jobs: steps: - name: Get current date as package key id: pkg_key - run: echo "::set-output name=key::$(date +'%w')" + run: echo "::set-output name=key::$(date +'%W')" - name: Checkout repository uses: actions/checkout@v3 @@ -58,7 +58,7 @@ jobs: uses: actions/cache@v3 with: path: ${{ env.XMAKE_GLOBALDIR }}\.xmake\packages - key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-${{ steps.pkg_key.outputs.key }} + key: MSVC-${{ matrix.arch }}-${{ matrix.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.pkg_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies