From 0b172edac4c449286c24f47ca8de7f2a0d4bbccb Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Fri, 18 Oct 2024 15:36:56 +0200 Subject: [PATCH 1/3] debug --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0cdc2ecf..a384569d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,15 +16,14 @@ variables: R_REL_VERSION: "4.4" R_REL_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/old/4.4.1/R-4.4.1-win.exe" RTOOLS_REL_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" - RTOOLS43_HOME: "/c/rtools" + RTOOLS44_HOME: "/c/rtools" R_DEV_VERSION: "4.5" R_DEV_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/R-devel-win.exe" RTOOLS_DEV_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" - RTOOLS44_HOME: "" ## in case R-devel will use new Rtools toolchain, now it uses 4.4 env var R_OLD_VERSION: "4.3" R_OLD_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/old/4.3.3/R-4.3.3-win.exe" RTOOLS_OLD_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools43/files/rtools43-5958-5975.exe" - RTOOLS42_HOME: "/c/rtools" + RTOOLS43_HOME: "/c/rtools" stages: - dependencies @@ -228,6 +227,8 @@ test-lin-ancient-cran: - Rscript.exe -e "source('.ci/ci.R'); install.packages(dcf.dependencies('DESCRIPTION', which='all'), repos=file.path('file://',getwd(),'bus/mirror-packages/cran'), quiet=TRUE)" - cp.exe $(ls.exe -1t bus/build/data.table_*.tar.gz | head.exe -n 1) . script: + - echo $env:PATH + - Rscript.exe -e "Sys.which('gcc')" - R.exe CMD check --no-manual $(ls.exe -1t data.table_*.tar.gz | head.exe -n 1) - R.exe CMD INSTALL --build $(ls.exe -1t data.table_*.tar.gz | head.exe -n 1) - -not (grep.exe "warning:" data.table.Rcheck\00install.out) From f78b865f743320058812674a0233fba4cb7f118c Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Fri, 18 Oct 2024 16:10:56 +0200 Subject: [PATCH 2/3] fix gcc not found --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a384569d2..ba48ee332 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,14 +16,14 @@ variables: R_REL_VERSION: "4.4" R_REL_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/old/4.4.1/R-4.4.1-win.exe" RTOOLS_REL_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" - RTOOLS44_HOME: "/c/rtools" + RTOOLS44_HOME: "/c/rtools" # needed for finding gcc #6552 R_DEV_VERSION: "4.5" R_DEV_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/R-devel-win.exe" - RTOOLS_DEV_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" + RTOOLS_DEV_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools44/files/rtools44-6104-6039.exe" # dev uses same rtools as release R_OLD_VERSION: "4.3" R_OLD_WIN_BIN: "https://cloud.r-project.org/bin/windows/base/old/4.3.3/R-4.3.3-win.exe" RTOOLS_OLD_BIN: "https://cloud.r-project.org/bin/windows/Rtools/rtools43/files/rtools43-5958-5975.exe" - RTOOLS43_HOME: "/c/rtools" + RTOOLS43_HOME: "/c/rtools" # needed for finding gcc #6552 stages: - dependencies @@ -227,8 +227,6 @@ test-lin-ancient-cran: - Rscript.exe -e "source('.ci/ci.R'); install.packages(dcf.dependencies('DESCRIPTION', which='all'), repos=file.path('file://',getwd(),'bus/mirror-packages/cran'), quiet=TRUE)" - cp.exe $(ls.exe -1t bus/build/data.table_*.tar.gz | head.exe -n 1) . script: - - echo $env:PATH - - Rscript.exe -e "Sys.which('gcc')" - R.exe CMD check --no-manual $(ls.exe -1t data.table_*.tar.gz | head.exe -n 1) - R.exe CMD INSTALL --build $(ls.exe -1t data.table_*.tar.gz | head.exe -n 1) - -not (grep.exe "warning:" data.table.Rcheck\00install.out) From 804b2b11b4a3e8f5b5ebb86d72361b7f4260a9e1 Mon Sep 17 00:00:00 2001 From: Benjamin Schwendinger Date: Fri, 18 Oct 2024 17:34:29 +0200 Subject: [PATCH 3/3] add CODEOWNERS --- CODEOWNERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index dc2aba5a1..6d12041c3 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -68,3 +68,6 @@ # docs /man/openmp-utils.Rd @Anirban166 /Seal_of_Approval.md @tdhock + +# GLCI +.gitlab-ci.yml @jangorecki @ben-schwen