Suggestions for R and ccache

apache · Sep 13, 2022 · 5bd1967 · 5bd1967
1 parent 5e724c1
commit 5bd1967
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
@@ -271,8 +271,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ steps.ccache-info.outputs.cache-dir }}
-          key: cpp-ccache-windows-v2-${{ hashFiles('cpp/**') }}
-          restore-keys: cpp-ccache-windows-v2-
+          key: cpp-ccache-windows-${{ env.CACHE_VERSION }}-${{ hashFiles('cpp/**') }}
+          restore-keys: cpp-ccache-windows-${{ env.CACHE_VERSION }}-
+        env:
+          # We can invalidate the current cache by updating this.
+          CACHE_VERSION: "2022-09-13"
       - name: Build
         shell: cmd
         run: |

diff --git a/r/src/Makevars.ucrt b/r/src/Makevars.ucrt
@@ -17,3 +17,6 @@
 
 CRT=-ucrt
 include Makevars.win
+
+# XXX for some reason, this variable doesn't seem propagated from Makevars.win
+CXX_STD=CXX17