Merge pull request #768 from molgenis/chore/ci-hack

chore: ci fix
molgenis · Jul 4, 2024 · 8a9f62b · 8a9f62b
2 parents 3478dae + 4e19e54
commit 8a9f62b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 rocker/verse:4.1.1
+FROM --platform=linux/amd64 rocker/verse:4.4.1
 
 LABEL maintainer="Clemens Tolboom <[email protected]>"
 LABEL version="0.0.1"

diff --git a/scripts/release/release-test.R b/scripts/release/release-test.R
@@ -19,6 +19,7 @@ print(sessionInfo())
 library(cli)
 cli_h1("Setup")
 cli_alert_info("Loading libraries")
+library(DSI)
 # for password prompt
 library(getPass)
 # for reading parquet files
@@ -35,7 +36,6 @@ library(RCurl)
 library(stringi)
 # armadillo/datashield libraries needed for testing
 library(MolgenisArmadillo)
-library(DSI)
 library(dsBaseClient)
 library(DSMolgenisArmadillo)
 library(resourcer)
@@ -139,18 +139,18 @@ verify_ds_mtl(skip_tests = test_config$skip_tests)
 
 cli_alert_info("Testing dsExposome")
 source("test-cases/xenon-exposome.R")
-run_exposome_tests(project = project1, url = test_config$armadillo_url, token = token, auth_type = test_config$auth_type, 
-                   ADMIN_MODE = test_config$ADMIN_MODE, profile = test_config$profile, profile_info = profile_info, 
-                   ref = exposome_ref, skip_tests = test_config$skip_tests, 
-                   user = test_config$user, admin_pwd = test_config$admin_pwd, interactive = test_config$interactive, 
+run_exposome_tests(project = project1, url = test_config$armadillo_url, token = token, auth_type = test_config$auth_type,
+                   ADMIN_MODE = test_config$ADMIN_MODE, profile = test_config$profile, profile_info = profile_info,
+                   ref = exposome_ref, skip_tests = test_config$skip_tests,
+                   user = test_config$user, admin_pwd = test_config$admin_pwd, interactive = test_config$interactive,
                    update_auto = test_config$update_auto)
 
 cli_alert_info("Testing dsOmics")
 source("test-cases/xenon-omics.R")
-run_omics_tests(project = project1, url = test_config$armadillo_url, token = token, auth_type = test_config$auth_type, 
-                   ADMIN_MODE = test_config$ADMIN_MODE, profile = test_config$profile, profile_info = profile_info, 
-                   ref = omics_ref, skip_tests = test_config$skip_tests, 
-                   user = test_config$user, admin_pwd = test_config$admin_pwd, interactive = test_config$interactive, 
+run_omics_tests(project = project1, url = test_config$armadillo_url, token = token, auth_type = test_config$auth_type,
+                   ADMIN_MODE = test_config$ADMIN_MODE, profile = test_config$profile, profile_info = profile_info,
+                   ref = omics_ref, skip_tests = test_config$skip_tests,
+                   user = test_config$user, admin_pwd = test_config$admin_pwd, interactive = test_config$interactive,
                    update_auto = test_config$update_auto)
 
 cli_h2("Removing data as admin")