diff --git a/.github/workflows/mac-artifact.yml b/.github/workflows/mac-artifact.yml index e80392c..d84ab6f 100644 --- a/.github/workflows/mac-artifact.yml +++ b/.github/workflows/mac-artifact.yml @@ -96,7 +96,7 @@ jobs: cache-index: "2" with: path: aws-sdk-cpp-${{ env.AWS_SDK_CPP_VERSION }} - key: aws-sdk-cpp-${{ env.cache-index }}-mac-artifact-${{ env.AWS_SDK_CPP_VERSION }}-${{ runner.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} + key: aws-sdk-cpp-${{ env.cache-index }}-mac-artifact-${{ env.AWS_SDK_CPP_VERSION }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} - name: Download AWS C++ sdk uses: actions/checkout@v3 if: steps.cache-aws-sdk-cpp.outputs.cache-hit != 'true' @@ -120,7 +120,7 @@ jobs: cache-index: "2" with: path: libssh2-${{ env.LIBSSH2_VERSION }} - key: libssh2-v2-${{ env.LIBSSH2_VERSION }}-${{ env.cache-index }}-${{ runner.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} + key: libssh2-v2-${{ env.LIBSSH2_VERSION }}-${{ env.cache-index }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} - name: Download libssh2 uses: actions/checkout@v3 if: steps.cache-libssh2.outputs.cache-hit != 'true' @@ -149,7 +149,7 @@ jobs: cache-index: "2" with: path: curl-${{ env.LIBCURL_VERSION }} - key: curl-v2-${{ env.LIBCURL_VERSION }}-${{ env.cache-index }}-${{ runner.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} + key: curl-v2-${{ env.LIBCURL_VERSION }}-${{ env.cache-index }}-${{ matrix.os }}-${{ runner.arch }}-cmake-${{ env.CMAKE_VERSION }} - name: Download libcurl uses: actions/checkout@v3 if: steps.cache-libcurl.outputs.cache-hit != 'true' @@ -183,7 +183,7 @@ jobs: cache-name: zstd with: path: zstd-${{ env.ZSTD_VERSION }} - key: zstd-${{ env.ZSTD_VERSION }}-${{ runner.os }}-${{ runner.arch }} + key: zstd-${{ env.ZSTD_VERSION }}-${{ matrix.os }}-${{ runner.arch }} - name: Build zstd id: build-zstd if: steps.cache-zstd.outputs.cache-hit != 'true' @@ -221,7 +221,7 @@ jobs: with: path: | ${{ steps.working-dir.outputs.value }}/binaries - key: ${{ env.cache-name }}-${{ env.cache-index }}-${{ runner.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-${{ env.AWS_SDK_CPP_VERSION }}-${{ env.ZSTD_VERSION }}-${{ steps.tag.outputs.tag }} + key: ${{ env.cache-name }}-${{ env.cache-index }}-${{ matrix.os }}-${{ runner.arch }}-${{ steps.system-info.outputs.release }}-${{ env.AWS_SDK_CPP_VERSION }}-${{ env.ZSTD_VERSION }}-${{ steps.tag.outputs.tag }} - name: Install AWS C++ sdk static library if: steps.cache-asbackup.outputs.cache-hit != 'true' run: | @@ -243,13 +243,13 @@ jobs: - name: Upload static asbackup artifact uses: actions/upload-artifact@v4 with: - name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ runner.os }}-${{ steps.system-info.outputs.release }}-asbackup-static + name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ matrix.os }}-${{ steps.system-info.outputs.release }}-asbackup-static path: ${{ steps.working-dir.outputs.value }}/binaries/static_bin/asbackup if-no-files-found: error - name: Upload static asrestore artifact uses: actions/upload-artifact@v4 with: - name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ runner.os }}-${{ steps.system-info.outputs.release }}-asrestore-static + name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ matrix.os }}-${{ steps.system-info.outputs.release }}-asrestore-static path: ${{ steps.working-dir.outputs.value }}/binaries/static_bin/asrestore if-no-files-found: error bundle-binaries: