diff --git a/.github/workflows/test-cache.yml b/.github/workflows/test-cache.yml index 7c791d18..80caf6c7 100644 --- a/.github/workflows/test-cache.yml +++ b/.github/workflows/test-cache.yml @@ -72,7 +72,6 @@ jobs: alr exec -- gprbuild --version # Verify proper builds - - run: alr -n version | grep "os:" | grep LINUX if: matrix.os == 'ubuntu-latest' shell: bash diff --git a/action.yml b/action.yml index 91305636..4f3c3129 100644 --- a/action.yml +++ b/action.yml @@ -61,12 +61,13 @@ runs: ~/.cache/alire ~/.config/alire ./alire_install + ~/.local/share/alire ~/AppData/Local/alire key: ${{steps.cache-key.outputs.key}} # .cache contains msys64 install on Windows # .config contains the toolchain at the default location, besides index config # ./alire_install contains alr itself - # ~/AppData is used with Alire 2.0 onwards + # ~/AppData and ./local/share/alire is used with Alire 2.0 onwards # Note that '~' is recommended on Windows too: https://github.com/actions/cache - name: Check cache output @@ -176,6 +177,7 @@ runs: path: | ~/.cache/alire ~/.config/alire + ~/.local/share/alire ./alire_install ~/AppData/Local/alire key: ${{ steps.cache-alr.outputs.cache-primary-key }}