From ff4277e97f06aa7893e6e68fb6b95c5775604f11 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Mon, 5 Feb 2024 16:56:00 +0100 Subject: [PATCH] CI: Save asan packages in a different cache --- .github/workflows/linux-build.yml | 4 ++-- .github/workflows/macos-build.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux-build.yml b/.github/workflows/linux-build.yml index 445f9defb..aa9c05001 100644 --- a/.github/workflows/linux-build.yml +++ b/.github/workflows/linux-build.yml @@ -26,7 +26,7 @@ jobs: kind: [shared, static] confs: - { mode: debug, archive: yes } - - { mode: debug, config: --asan=y, archive: false } + - { mode: debug, config: --asan=y, archive: false, cache_key: -asan } - { mode: debug, config: --lsan=y, archive: false } - { mode: debug, config: --tsan=y, archive: false } - { mode: releasedbg, archive: yes } @@ -74,7 +74,7 @@ jobs: uses: actions/cache/restore@v4 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: Linux-${{ matrix.arch }}-${{ matrix.confs.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }} + key: Linux-${{ matrix.arch }}-${{ matrix.confs.mode }}${{ matrix.confs.cache_key }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_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 7d7510ec0..7a7855c93 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -26,7 +26,7 @@ jobs: kind: [shared, static] confs: - { mode: debug, archive: yes } - - { mode: debug, config: --asan=y, archive: false } + - { mode: debug, config: --asan=y, archive: false, cache_key: -asan } - { mode: debug, config: --lsan=y, archive: false } - { mode: debug, config: --tsan=y, archive: false } - { mode: releasedbg, archive: yes } @@ -68,7 +68,7 @@ jobs: uses: actions/cache/restore@v4 with: path: ${{ env.XMAKE_GLOBALDIR }}/.xmake/packages - key: macOS-${{ matrix.arch }}-${{ matrix.confs.mode }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }} + key: macOS-${{ matrix.arch }}-${{ matrix.confs.mode }}${{ matrix.confs.cache_key }}-${{ steps.dep_hash.outputs.hash }}-W${{ steps.cache_key.outputs.key }} # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies