diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 22c64ab66c..a9e4813b01 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -5,6 +5,7 @@ on: pull_request: branches: - master + workflow_dispatch: name: R-CMD-check @@ -20,20 +21,20 @@ jobs: config: - {os: windows-latest, r: 'release'} - {os: macOS-latest, r: 'release'} - - {os: ubuntu-16.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/xenial/latest"} + - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true RSPM: ${{ matrix.config.rspm }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@master + - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} - - uses: r-lib/actions/setup-pandoc@master + - uses: r-lib/actions/setup-pandoc@v2 - name: Query dependencies run: | @@ -52,12 +53,11 @@ jobs: - name: Install system dependencies if: runner.os == 'Linux' + run: | + # Add the appropriate commands to install system dependencies here + echo "Linux setup" env: RHUB_PLATFORM: linux-x86_64-ubuntu-gcc - run: | - Rscript -e "remotes::install_github('r-hub/sysreqs')" - sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))") - sudo -s eval "$sysreqs" - name: Install dependencies run: | @@ -73,7 +73,7 @@ jobs: - name: Upload check results if: failure() - uses: actions/upload-artifact@master + uses: actions/upload-artifact@v4 with: name: ${{ runner.os }}-r${{ matrix.config.r }}-results path: check diff --git a/configure.win b/configure.win index a1398504ef..e4cf9874bb 100755 --- a/configure.win +++ b/configure.win @@ -1,5 +1,5 @@ #!/bin/bash -CXX_STD=CXX14 +CXX_STD=CXX17 CC=`${R_HOME}/bin${R_ARCH_BIN}/R.exe CMD config CC` CXX=`${R_HOME}/bin${R_ARCH_BIN}/R.exe CMD config CXX` JTHREADS=1