Skip to content

Commit 135b5cf

Browse files
committed
new system for atlas build
Also updating R CMD check
1 parent e988914 commit 135b5cf

File tree

2 files changed

+14
-46
lines changed

2 files changed

+14
-46
lines changed

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

Lines changed: 11 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -55,59 +55,33 @@ jobs:
5555
- name: Checkout
5656
uses: actions/checkout@v4
5757

58-
- name: R setup-pandoc@master
58+
- name: Setup R
5959
uses: r-lib/actions/setup-r@v2
6060
with:
6161
r-version: ${{ matrix.config.r }}
6262

63-
- name: Pandoc setup-pandoc@master
64-
uses: r-lib/actions/setup-pandoc@v2
65-
66-
- name: Query dependencies
67-
run: |
68-
install.packages('remotes')
69-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
70-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
71-
shell: Rscript {0}
72-
73-
- name: Cache R packages
74-
if: runner.os != 'Windows'
75-
uses: actions/cache@v3
63+
- name: Setup R dependencies
64+
uses: r-lib/actions/setup-r-dependencies@v2
7665
with:
77-
path: ${{ env.R_LIBS_USER }}
78-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
79-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
80-
81-
- name: Install system dependencies
82-
if: runner.os == 'Linux'
83-
env:
84-
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
85-
run: |
86-
Rscript -e "remotes::install_github('r-hub/sysreqs')"
87-
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
88-
sudo -s eval "$sysreqs"
89-
sudo apt-get install libcurl4-openssl-dev
90-
91-
- name: Install dependencies
92-
run: |
93-
remotes::install_deps(dependencies = TRUE)
94-
remotes::install_cran("rcmdcheck")
95-
shell: Rscript {0}
66+
extra-packages: any::rcmdcheck
67+
needs: check
9668

9769
- name: Check Standard
70+
uses: r-lib/actions/check-r-package@v2
9871
if: ( matrix.config.os == 'ubuntu-latest' && matrix.config.r == 'devel' ) == false
9972
env:
10073
_R_CHECK_CRAN_INCOMING_REMOTE_: false
10174
_R_CHECK_LENGTH_1_CONDITION_: true
10275
_R_CHECK_LENGTH_0_LOGIC2_: true
103-
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
104-
shell: Rscript {0}
76+
with:
77+
args: 'c("--no-manual", "--as-cran")'
10578

10679
- name: Install Valgrind (Linux-rdevel only)
10780
if: matrix.config.os == 'ubuntu-latest' && matrix.config.r == 'devel'
10881
run: sudo apt-get install valgrind
10982

11083
- name: Check Valgrind (Linux-rdevel only)
84+
uses: r-lib/actions/check-r-packages@v2
11185
if: matrix.config.os == 'ubuntu-latest' && matrix.config.r == 'devel'
11286
env:
11387
_R_CHECK_CRAN_INCOMING_REMOTE_: false
@@ -116,19 +90,12 @@ jobs:
11690
# https://www.stats.ox.ac.uk/pub/bdr/memtests/README.txt
11791
RJAVA_JVM_STACK_WORKAROUND: 0
11892
R_DONT_USE_TK: true
119-
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--use-valgrind"), error_on = "warning", check_dir = "check")
120-
shell: Rscript {0}
93+
with:
94+
args: 'c("--no-manual", "--as-cran")'
12195

12296
- name: Code Coverage
12397
if: matrix.config.os == 'windows-latest' && matrix.config.r == 'release'
12498
run: |
12599
install.packages("covr")
126100
covr::codecov(line_exclusions=list("src/COrthogonalArray.cpp", "src/COrthogonalArray.h", "src/CRandom.h", "src/RStandardUniform.h", "src/ak3.cpp", "src/akconst.cpp", "src/akn.cpp", "src/construct.cpp", "src/GaloisField.h", "src/GaloisField.cpp", "src/geneticLHS.cpp", "src/improvedLHS.cpp", "src/matrix.h", "src/maximinLHS.cpp", "src/oa.cpp", "src/oaLHS.cpp", "src/oaLHSUtility.h", "src/optSeededLHS.cpp", "src/optimumLHS.cpp", "src/order.h", "src/primes.cpp", "src/randomLHS.cpp", "src/runif.cpp", "src/runif.h", "src/rutils.cpp", "src/rutils.h", "src/utilityLHS.cpp", "src/utilityLHS.h", "src/xtn.h", "src/bclibVersion.h", "src/oalibVersion.h", "src/lhslibVersion.h", "src/OACommonDefines.h"))
127101
shell: Rscript {0}
128-
129-
- name: Upload check results
130-
if: failure()
131-
uses: actions/upload-artifact@v4
132-
with:
133-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
134-
path: check

.github/workflows/rhub.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,17 @@ jobs:
7777
- name: Environment variable for ASAN
7878
if: matrix.config.label == 'clang-asan'
7979
# https://github.com/llvm/llvm-project/issues/59432
80-
# Also found memory errors in the font libraries when building vignettes
8180
run: |
8281
echo "ASAN_OPTIONS=alloc_dealloc_mismatch=0" >> $GITHUB_ENV
8382
echo "CHECK_ARGS=--ignore-vignettes --extra-arch" >> $GITHUB_ENV
8483
echo "BUILD_ARGS=--no-build-vignettes" >> $GITHUB_ENV
8584
- name: Bad CXXFLAGS for atlas
8685
if: matrix.config.label == 'atlas'
8786
# throws a warning on non-portable compilation flags
87+
# Can's set _R_CHECK_COMPILATION_FLAGS_=FALSE because --as-cran resets it
88+
# instead, allow for the flags that are a problem
8889
run: |
89-
echo "_R_CHECK_COMPILATION_FLAGS_=FALSE" >> $GITHUB_ENV
90+
echo '_R_CHECK_COMPILATION_FLAGS_KNOWN_="-Werror=format-security -Werror=implicit-function-declaration -Wno-ignored-attributes -Wno-parentheses -Wp,-D_FORTIFY_SOURCE=3"' >> $GITHUB_ENV
9091
- uses: r-hub/actions/run-check@v1
9192
with:
9293
token: ${{ secrets.RHUB_TOKEN }}

0 commit comments

Comments
 (0)