Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: Fix cache key fix #105

Merged
merged 3 commits into from
Nov 6, 2024
Merged

build: Fix cache key fix #105

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83d8e03
build: Fix cache key fix
a-spiker Nov 6, 2024
a0a2288
use matrix.os instead of runner.os
a-spiker Nov 6, 2024
2b3d48b
Added some fixes to the cache key
a-spiker Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/mac-artifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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: |
Expand All @@ -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:
Expand Down
Loading