From 0557c2a11b92a5ce3d2bf9a5182077788c6b2da8 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Fri, 13 Jun 2025 21:45:19 +0200 Subject: [PATCH 1/4] add renv cache to cache --- .github/workflows/dev.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index dda648c8c47..3291f39f32e 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -60,7 +60,9 @@ jobs: - name: Cache pre-commit uses: actions/cache@v4 with: - path: ~/.cache/pre-commit + path: | + ~/.cache/pre-commit + ~/local/share/renv/cache key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} - name: Run pre-commit run: | From 71854b6e4e105573cfb39346837312a0cd5089d8 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Fri, 13 Jun 2025 21:59:58 +0200 Subject: [PATCH 2/4] install r-base --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 3291f39f32e..cfa11950e51 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -55,7 +55,7 @@ jobs: sudo apt update sudo apt install -y -V \ pre-commit \ - r-cran-xml2 \ + r-base \ ruby-dev - name: Cache pre-commit uses: actions/cache@v4 From 911dd512744b4c3ca3d15a11b30823d4fef78587 Mon Sep 17 00:00:00 2001 From: Jacob Wujciak-Jens Date: Fri, 13 Jun 2025 22:13:39 +0200 Subject: [PATCH 3/4] fix typo and bump cache --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index cfa11950e51..98ac24cd105 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -62,8 +62,8 @@ jobs: with: path: | ~/.cache/pre-commit - ~/local/share/renv/cache - key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} + ~/.local/share/renv/cache + key: pre-commit-v2-${{ hashFiles('.pre-commit-config.yaml') }} - name: Run pre-commit run: | pre-commit run --all-files --color=always --show-diff-on-failure From 1c68be57b4f1921742f4ef97eb4826cfde54010f Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Sun, 15 Jun 2025 05:55:07 +0900 Subject: [PATCH 4/4] Revert key change --- .github/workflows/dev.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 98ac24cd105..fc18c75fd53 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -63,7 +63,7 @@ jobs: path: | ~/.cache/pre-commit ~/.local/share/renv/cache - key: pre-commit-v2-${{ hashFiles('.pre-commit-config.yaml') }} + key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }} - name: Run pre-commit run: | pre-commit run --all-files --color=always --show-diff-on-failure