changeset 31327:53987cfe08a0

GitHub-CI (windows): Cache location changed with newer ccache version. * .github/workflows/make.yaml (windows): The cache location has changed since ccache was updated to a newer version in MSYS2. Use new location for configuration and cache action.
author Markus Mützel <markus.muetzel@gmx.de>
date Sat, 22 Oct 2022 20:24:03 +0200
parents 49972715a95a
children 158f37cbbf5c
files .github/workflows/make.yaml
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.github/workflows/make.yaml	Sat Oct 22 20:18:12 2022 +0200
+++ b/.github/workflows/make.yaml	Sat Oct 22 20:24:03 2022 +0200
@@ -441,13 +441,14 @@
         # Create human readable timestamp
         id: ccache_cache_timestamp
         run: |
+          echo "ccachedir=$(cygpath -m $(ccache -k cache_dir))" >> $GITHUB_OUTPUT
           echo "timestamp=$(date +"%Y-%m-%d_%H-%M-%S")" >> $GITHUB_OUTPUT
 
       - name: restore ccache
         # Setup the github cache used to maintain the ccache from one job to the next
         uses: actions/cache@v3
         with:
-          path: C:/msys64/home/runneradmin/.ccache
+          path: ${{ steps.ccache_cache_timestamp.outputs.ccachedir }}
           key: ccache:${{ matrix.os }}:${{ matrix.msystem }}:${{ github.ref }}:${{ steps.ccache_cache_timestamp.outputs.timestamp }}:${{ github.sha }}
           restore-keys: |
             ccache:${{ matrix.os }}:${{ matrix.msystem }}:${{ github.ref }}
@@ -457,9 +458,10 @@
         # Limit the maximum size and switch on compression to avoid exceeding the total disk or cache quota.
         run: |
           which ccache
-          test -d ~/.ccache || mkdir -p ~/.ccache
-          echo "max_size = 0.9G" > ~/.ccache/ccache.conf
-          echo "compression = true" >> ~/.ccache/ccache.conf
+          test -d ${{ steps.ccache_cache_timestamp.outputs.ccachedir }} || mkdir -p ${{ steps.ccache_cache_timestamp.outputs.ccachedir }}
+          echo "max_size = 0.9G" > ${{ steps.ccache_cache_timestamp.outputs.ccachedir }}/ccache.conf
+          echo "compression = true" >> ${{ steps.ccache_cache_timestamp.outputs.ccachedir }}/ccache.conf
+          ccache -p
           ccache -s
           # create ccache helper script for Fortran compiler
           echo -e '#!/bin/bash\nccache '$MINGW_PREFIX'/bin/'$F77' "$@"' > $MINGW_PREFIX/lib/ccache/bin/$F77