From dfd90f0c1c748cf2b44cebdcc9059f2188f56a8e Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Thu, 8 Aug 2024 22:35:05 +0200 Subject: [PATCH 1/8] add fixed version for old r version --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83def117b..3f73d9a9a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,6 +209,9 @@ test-lin-ancient-cran: <<: *test-lin script: - *install-deps + - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/pkgname_version.tar.gz", repos = NULL, type = "source")' + - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/evaluate/pkgname_version.tar.gz", repos = NULL, type = "source")' + - Rscript -e 'install.packages("knitr")' - R CMD check --no-manual $(ls -1t data.table_*.tar.gz | head -n 1) .test-win-template: &test-win From 3f945c616451d97735110493c80e49c97bba9370 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 10 Aug 2024 09:58:16 +0200 Subject: [PATCH 2/8] add versions --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f73d9a9a..7d69b0d61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,8 +209,8 @@ test-lin-ancient-cran: <<: *test-lin script: - *install-deps - - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/pkgname_version.tar.gz", repos = NULL, type = "source")' - - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/evaluate/pkgname_version.tar.gz", repos = NULL, type = "source")' + - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' + - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/evaluate/evaluate_0.23.tar.gz", repos = NULL, type = "source")' - Rscript -e 'install.packages("knitr")' - R CMD check --no-manual $(ls -1t data.table_*.tar.gz | head -n 1) From 931124bbb6ef30cfdf6318a2f0096a26084b2b6b Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Sat, 10 Aug 2024 10:03:33 +0200 Subject: [PATCH 3/8] add cran repo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d69b0d61..dfbc88de2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,7 +211,7 @@ test-lin-ancient-cran: - *install-deps - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/evaluate/evaluate_0.23.tar.gz", repos = NULL, type = "source")' - - Rscript -e 'install.packages("knitr")' + - Rscript -e 'install.packages("knitr", repos = "https://cloud.r-project.org")' - R CMD check --no-manual $(ls -1t data.table_*.tar.gz | head -n 1) .test-win-template: &test-win From 93dee0b3b8f4a637c7194d206ba043c4193d31b0 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Mon, 19 Aug 2024 13:11:37 +0200 Subject: [PATCH 4/8] remove knitr from check --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfbc88de2..7b8f81e7a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,14 +205,14 @@ test-lin-dev-clang-cran: # stated dependency on R test-lin-ancient-cran: - image: registry.gitlab.com/jangorecki/dockerfiles/r-3.3.0 <<: *test-lin + image: registry.gitlab.com/jangorecki/dockerfiles/r-3.3.0 + variables: + _R_CHECK_FORCE_SUGGESTS_: "FALSE" script: - *install-deps - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' - - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/evaluate/evaluate_0.23.tar.gz", repos = NULL, type = "source")' - - Rscript -e 'install.packages("knitr", repos = "https://cloud.r-project.org")' - - R CMD check --no-manual $(ls -1t data.table_*.tar.gz | head -n 1) + - R CMD check --no-manual --no-build-vignettes --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) .test-win-template: &test-win <<: *test From cb19ef44aab66bf236fe183b30c514c75598b451 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger <52290390+ben-schwen@users.noreply.github.com> Date: Tue, 20 Aug 2024 08:15:31 +0200 Subject: [PATCH 5/8] add note about knitr Co-authored-by: Michael Chirico --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b8f81e7a..a60846872 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,6 +212,8 @@ test-lin-ancient-cran: script: - *install-deps - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' + # knitr requires evaluate, which requires R 3.6.0. + # Restore checking vignettes if upgrading our R dependency means knitr can be installed. - R CMD check --no-manual --no-build-vignettes --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) .test-win-template: &test-win From 322c5a4325b409e18975d020ff1c9a3033595fc9 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Tue, 20 Aug 2024 08:17:52 +0200 Subject: [PATCH 6/8] remove xts and add comment --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a60846872..7341a4cb0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,7 +208,7 @@ test-lin-ancient-cran: <<: *test-lin image: registry.gitlab.com/jangorecki/dockerfiles/r-3.3.0 variables: - _R_CHECK_FORCE_SUGGESTS_: "FALSE" + _R_CHECK_FORCE_SUGGESTS_: "FALSE" # can be removed if all dependencies are available, e.g. knitr, xts script: - *install-deps - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' From be129488ecb973ab44b6198926a81b720867ee16 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Tue, 20 Aug 2024 08:23:20 +0200 Subject: [PATCH 7/8] remove xts --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7341a4cb0..718fcfc41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,7 +211,6 @@ test-lin-ancient-cran: _R_CHECK_FORCE_SUGGESTS_: "FALSE" # can be removed if all dependencies are available, e.g. knitr, xts script: - *install-deps - - Rscript -e 'install.packages("https://cran.r-project.org/src/contrib/Archive/xts/xts_0.12.2.tar.gz", repos = NULL, type = "source")' # knitr requires evaluate, which requires R 3.6.0. # Restore checking vignettes if upgrading our R dependency means knitr can be installed. - R CMD check --no-manual --no-build-vignettes --ignore-vignettes $(ls -1t data.table_*.tar.gz | head -n 1) From 19540da840a0328c3f5adfcaa9aa8f750ad547d1 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Tue, 20 Aug 2024 08:24:28 +0200 Subject: [PATCH 8/8] refine comment --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 718fcfc41..20f2db3f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,7 +208,7 @@ test-lin-ancient-cran: <<: *test-lin image: registry.gitlab.com/jangorecki/dockerfiles/r-3.3.0 variables: - _R_CHECK_FORCE_SUGGESTS_: "FALSE" # can be removed if all dependencies are available, e.g. knitr, xts + _R_CHECK_FORCE_SUGGESTS_: "FALSE" # can be removed if all dependencies are available (knitr, xts, etc.) script: - *install-deps # knitr requires evaluate, which requires R 3.6.0.