From 04e1ae2308b9e5da9bc6f65ce3c9bcc3bd4b9c96 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Tue, 30 Jun 2020 02:46:17 +0200 Subject: Do not mix CCache artifacts between similar versions of same OS + runner.os is for example "macOS" + matrix.os would be "macos-10.15" This way we don't mix the CCache artifacts between different versions of the same OS. Change-Id: I90da8c1013d661ddddbc22d205af4858db057b14 Reviewed-by: Alexandru Croitor --- .github/workflows/ninja-build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to '.github/workflows/ninja-build.yml') diff --git a/.github/workflows/ninja-build.yml b/.github/workflows/ninja-build.yml index 214ec6db1e..b333e9f27a 100644 --- a/.github/workflows/ninja-build.yml +++ b/.github/workflows/ninja-build.yml @@ -66,14 +66,14 @@ jobs: path: ~/.ccache # "github.run_id" is unique, which causes the cache to always get # saved at the end of a successful run. - key: ccache-${{ runner.os }}-${{ github.ref }}-${{ github.run_id }} + key: ccache-${{ matrix.os }}-${{ github.ref }}-${{ github.run_id }} # As the unique "key" above will never be found in the cache when the # job starts, we need these broader "restore-keys" in order to match # and restore the most recent cache. restore-keys: | - ccache-${{ runner.os }}-${{ github.ref }}- - ccache-${{ runner.os }}-refs/heads/dev- - ccache-${{ runner.os }}- + ccache-${{ matrix.os }}-${{ github.ref }}- + ccache-${{ matrix.os }}-refs/heads/dev- + ccache-${{ matrix.os }}- - name: install build dependencies run: ${{ matrix.install_cmd }} ${{ matrix.deps }} ${{ matrix.install_cmd_postfix }} -- cgit v1.2.3