minor changes

.github/actions/setup-r-dependencies/action.yaml

@@ -141,8 +141,8 @@ runs:
  path: |
  ${{ env.R_LIBS_USER }}/*
  !${{ env.R_LIBS_USER }}/pak
- key: ${{ format('{0}-{1}-{2}-{3}', steps.install.outputs.os-version, steps.install.outputs.r-version, inputs.cache-version, inputs.dependency_repo, hashFiles(format('{0}/.github/pkg.lock', inputs.working-directory ))) }}
- restore-keys: ${{ steps.install.outputs.os-version }}-${{ steps.install.outputs.r-version }}-${{inputs.cache-version }}-
+ key: ${{ format('{0}-{1}-{2}-{3}-{5}', steps.install.outputs.os-version, steps.install.outputs.r-version, inputs.cache-version, inputs.dependency_repo, hashFiles(format('{0}/.github/pkg.lock', inputs.working-directory ))) }}
+ restore-keys: ${{ steps.install.outputs.os-version }}-${{ steps.install.outputs.r-version }}-${{inputs.cache-version }}-${{inputs.dependency_repo }}-
 
  - name: Install dependencies
  run: |

.github/workflows/R-CMD-check-versions.yaml

@@ -57,66 +57,6 @@
  dependency_repo: ${{ steps.cran-image.outputs.image }}
  working-directory: ${{ github.workspace }}
  extra-packages: any::rcmdcheck
-
-
- # - name: Install curl
- # if: matrix.os == 'ubuntu-latest' && matrix.config.date != 'latest'
- # run: |
- # sudo apt install libcurl4-openssl-dev
-
- # - name: Install pak (Windows + CRAN snapshot) 
- # if: runner.os == 'Windows' && matrix.config.date != 'latest'
- # run: |
- # # Install pak
- # cat("::group::Install pak\n")
- # #lib <- Sys.getenv("R_LIB_FOR_PAK")
- # #dir.create(lib, showWarnings = FALSE, recursive = TRUE)
- # install.packages("pak", repos = sprintf(
- # "https://r-lib.github.io/p/pak/%s/%s/%s/%s",
- # "stable",
- # .Platform$pkgType,
- # R.Version()$os,
- # R.Version()$arch
- # ))
- # cat("::endgroup::\n")
- # shell: Rscript {0}
-
- # - name: Install pak (Unix + CRAN snapshot)
- # if: runner.os != 'Windows' && matrix.config.date != 'latest'
- # run: |
- # # Install pak
- # echo "::group::Install pak"
- # if which sudo >/dev/null; then SUDO="sudo -E --preserve-env=PATH env"; else SUDO=""; fi
- # #$SUDO R -q -e 'dir.create(Sys.getenv("R_LIB_FOR_PAK"), recursive = TRUE, showWarnings = FALSE)'
- # $SUDO R -q -e 'install.packages("pak", repos = sprintf("https://r-lib.github.io/p/pak/%s/%s/%s/%s", "stable", .Platform$pkgType, R.Version()$os, R.Version()$arch))'
- # echo "::endgroup::"
- # shell: bash
-
-
- # # Install package dependencies (if a specific date) 
- # - name: Install dependencies ${{ matrix.config.date }} (CRAN snapshot)
- # if: matrix.config.date != 'latest'
- # run: |
- # options(
- # repos = c(CRAN = "https://packagemanager.posit.co/cran/${{ matrix.config.date }}")
- # )
-
- # #install.packages(c("rcmdcheck", "devtools"), Ncpus = parallel::detectCores()-1)
-
- # pak::pkg_install(".", dependencies = TRUE, upgrade = TRUE)
-
- # #devtools::install(".", dependencies = TRUE, upgrade = TRUE, Ncpus = parallel::detectCores()-1)
-
- # shell: Rscript {0}
-
- # # Install package dependencies (if lastest)
- # - name: Install dependencies (CRAN latest) 
- # if: matrix.config.date == 'latest'
- # uses: r-lib/actions/setup-r-dependencies@v2
- # with:
- # extra-packages: any::rcmdcheck
- # needs: check
-
 
  - name: Session info
  run: |