From cefa52b44bb270797ca061afd7e6375f3ce7f693 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Thu, 27 Aug 2026 11:41:22 +0100 Subject: [PATCH 1/3] Switch to armadillo dev --- docker-compose_armadillo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index dba71daf8..95bb332cf 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -3,7 +3,7 @@ services: hostname: armadillo ports: - 8080:8080 - image: datashield/armadillo_citest:latest + image: datashield/armadillo_dev:latest environment: LOGGING_CONFIG: 'classpath:logback-file.xml' AUDIT_LOG_PATH: '/app/logs/audit.log' From d681c2f9bcb7ea0ffb350a94a7ef0e6546e236cf Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 28 Aug 2026 10:22:08 +0100 Subject: [PATCH 2/3] Fix typo in perf profile --- .../perf_files/armadillo_azure-pipeline_perf-profile.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/perf_files/armadillo_azure-pipeline_perf-profile.csv b/tests/testthat/perf_files/armadillo_azure-pipeline_perf-profile.csv index ece353a19..e3862768a 100644 --- a/tests/testthat/perf_files/armadillo_azure-pipeline_perf-profile.csv +++ b/tests/testthat/perf_files/armadillo_azure-pipeline_perf-profile.csv @@ -8,7 +8,7 @@ "ds.asLogical::perf::0","17.46","0.5","2" "ds.asMatrix::perf::0","17.44","0.5","2" "ds.asNumeric::perf:0","16.79","0.5","2" -"ds.Boole::perf::0","2.179","0.5,"2" +"ds.Boole::perf::0","2.179","0.5","2" "ds.assign::perf::0","10.23","0.5","2" "ds.cbind::perf::0","3.814","0.5","2" "ds.class::perf::combine:0","24.90","0.5","2" From 0be5023bdf5b81081ab5ecb209381f20c7af1006 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 28 Aug 2026 17:38:26 +0100 Subject: [PATCH 3/3] Switch to armadillo back citest:latest - 5.17.2 --- docker-compose_armadillo.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose_armadillo.yml b/docker-compose_armadillo.yml index 95bb332cf..dba71daf8 100644 --- a/docker-compose_armadillo.yml +++ b/docker-compose_armadillo.yml @@ -3,7 +3,7 @@ services: hostname: armadillo ports: - 8080:8080 - image: datashield/armadillo_dev:latest + image: datashield/armadillo_citest:latest environment: LOGGING_CONFIG: 'classpath:logback-file.xml' AUDIT_LOG_PATH: '/app/logs/audit.log'