From 8fd9f6f85e85facc40ec4c305556ba364ebfe39d Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Wed, 18 Dec 2024 16:00:15 +0100 Subject: [PATCH 1/5] add alpine linux --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91d1a9849..535e86eb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,6 +136,21 @@ test-lin-rel-vanilla: - echo 'CXXFLAGS=-g -O0 -fno-openmp -Wall -Wvla -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' >> ~/.R/Makevars - R CMD check --no-manual --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) +## alpine linux +test-lin-alp-rel-cran: + <<: *test-lin + image: registry.gitlab.com/jangorecki/dockerfiles/r-base-alpine + variables: + _R_CHECK_CRAN_INCOMING_: "TRUE" ## stricter --as-cran checks should run in dev pipelines continuously (not sure what they are though) + _R_CHECK_CRAN_INCOMING_REMOTE_: "FALSE" ## Other than no URL checking (takes many minutes) or 'Days since last update 0' NOTEs needed, #3284 + _R_CHECK_CRAN_INCOMING_TARBALL_THRESHOLD_: "7500000" ## bytes + _R_CHECK_PKG_SIZES_THRESHOLD_: "10" ## MB 'checking installed package size' NOTE increased due to po + script: + - *install-deps + - echo 'CFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' > ~/.R/Makevars + - echo 'CXXFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' >> ~/.R/Makevars + - R CMD check --as-cran $(ls -1t data.table_*.tar.gz | head -n 1) + ## R-release on Linux # strict checks for 0 NOTEs # extra NOTEs check and build pdf manual thus not from cran-lin template From 4ac8ba2a05ac75ca3f287f11d38e3c2617a1106b Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Wed, 18 Dec 2024 16:03:03 +0100 Subject: [PATCH 2/5] update README --- .ci/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/README.md b/.ci/README.md index cdd02f598..36e8af2a9 100644 --- a/.ci/README.md +++ b/.ci/README.md @@ -56,6 +56,7 @@ Basic CI checks are also run on every push to the GitLab repository. This can ** ```shell # fetch changes from remote (GitHub) and push them to GitLab git fetch git@github.com:Rdatatable/data.table.git new_branch:new_branch +git checkout new_branch git push # after updating on GitHub, pull changes from remote and push to GitLab git pull git@github.com:Rdatatable/data.table.git new_branch From ced4c89fec1f2ac6cdfd0271412e006b0da0d566 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Wed, 18 Dec 2024 17:34:47 +0100 Subject: [PATCH 3/5] update alpine check to minimum --- .gitlab-ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 535e86eb8..dc2d80127 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,16 +140,11 @@ test-lin-rel-vanilla: test-lin-alp-rel-cran: <<: *test-lin image: registry.gitlab.com/jangorecki/dockerfiles/r-base-alpine - variables: - _R_CHECK_CRAN_INCOMING_: "TRUE" ## stricter --as-cran checks should run in dev pipelines continuously (not sure what they are though) - _R_CHECK_CRAN_INCOMING_REMOTE_: "FALSE" ## Other than no URL checking (takes many minutes) or 'Days since last update 0' NOTEs needed, #3284 - _R_CHECK_CRAN_INCOMING_TARBALL_THRESHOLD_: "7500000" ## bytes - _R_CHECK_PKG_SIZES_THRESHOLD_: "10" ## MB 'checking installed package size' NOTE increased due to po script: - *install-deps - echo 'CFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' > ~/.R/Makevars - echo 'CXXFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' >> ~/.R/Makevars - - R CMD check --as-cran $(ls -1t data.table_*.tar.gz | head -n 1) + - R CMD check --no-manual --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) ## R-release on Linux # strict checks for 0 NOTEs From ba91d98763d21d17fa1687e5aea9c4afbfb1442c Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Thu, 19 Dec 2024 10:34:52 +0100 Subject: [PATCH 4/5] use as cran --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc2d80127..535e86eb8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,11 +140,16 @@ test-lin-rel-vanilla: test-lin-alp-rel-cran: <<: *test-lin image: registry.gitlab.com/jangorecki/dockerfiles/r-base-alpine + variables: + _R_CHECK_CRAN_INCOMING_: "TRUE" ## stricter --as-cran checks should run in dev pipelines continuously (not sure what they are though) + _R_CHECK_CRAN_INCOMING_REMOTE_: "FALSE" ## Other than no URL checking (takes many minutes) or 'Days since last update 0' NOTEs needed, #3284 + _R_CHECK_CRAN_INCOMING_TARBALL_THRESHOLD_: "7500000" ## bytes + _R_CHECK_PKG_SIZES_THRESHOLD_: "10" ## MB 'checking installed package size' NOTE increased due to po script: - *install-deps - echo 'CFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' > ~/.R/Makevars - echo 'CXXFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' >> ~/.R/Makevars - - R CMD check --no-manual --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) + - R CMD check --as-cran $(ls -1t data.table_*.tar.gz | head -n 1) ## R-release on Linux # strict checks for 0 NOTEs From e62abf30bfbf7361f3ec65a9fef7ae2ebf6ca1cf Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Thu, 19 Dec 2024 13:56:16 +0100 Subject: [PATCH 5/5] remove as cran --- .gitlab-ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 535e86eb8..bd4841da5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,19 +137,14 @@ test-lin-rel-vanilla: - R CMD check --no-manual --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) ## alpine linux -test-lin-alp-rel-cran: +test-lin-alp-rel: <<: *test-lin image: registry.gitlab.com/jangorecki/dockerfiles/r-base-alpine - variables: - _R_CHECK_CRAN_INCOMING_: "TRUE" ## stricter --as-cran checks should run in dev pipelines continuously (not sure what they are though) - _R_CHECK_CRAN_INCOMING_REMOTE_: "FALSE" ## Other than no URL checking (takes many minutes) or 'Days since last update 0' NOTEs needed, #3284 - _R_CHECK_CRAN_INCOMING_TARBALL_THRESHOLD_: "7500000" ## bytes - _R_CHECK_PKG_SIZES_THRESHOLD_: "10" ## MB 'checking installed package size' NOTE increased due to po script: - *install-deps - echo 'CFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' > ~/.R/Makevars - echo 'CXXFLAGS=-g -O2 -fopenmp -Wall -pedantic -fstack-protector-strong -D_FORTIFY_SOURCE=2' >> ~/.R/Makevars - - R CMD check --as-cran $(ls -1t data.table_*.tar.gz | head -n 1) + - R CMD check $(ls -1t data.table_*.tar.gz | head -n 1) ## R-release on Linux # strict checks for 0 NOTEs