Skip to content

Commit

Permalink
Merge pull request #65 from cookpa/patch-1
Browse files Browse the repository at this point in the history
* CI: Update build versions

Remove deprecated actions, build on supported ubuntu

* COMP: Update Windows to c++17

Windows is still failing because it uses rtools44, which uses gcc 13. Attempts to install earlier rtools did not succeed. The error may be fixed
  • Loading branch information
cookpa authored Oct 21, 2024
2 parents 56e57d5 + d125450 commit bae1199
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
pull_request:
branches:
- master
workflow_dispatch:

name: R-CMD-check

Expand All @@ -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: |
Expand All @@ -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: |
Expand All @@ -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
2 changes: 1 addition & 1 deletion configure.win
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit bae1199

Please sign in to comment.