From fbdfa42b431b6148ae8ad7ed0e0158d7a6db7f57 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Fri, 10 Apr 2026 11:38:37 +0100 Subject: [PATCH 1/4] Permit perf test duration to be set, seconds, by environment variable 'PERF_DURATION_SEC' --- tests/testthat/test-perf-meanDS.R | 6 +++--- tests/testthat/test-perf-varDS.R | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/testthat/test-perf-meanDS.R b/tests/testthat/test-perf-meanDS.R index 794e61b2..947c46ef 100644 --- a/tests/testthat/test-perf-meanDS.R +++ b/tests/testthat/test-perf-meanDS.R @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -# Copyright (c) 2024 Arjuna Technologies, Newcastle upon Tyne. All rights reserved. +# Copyright (c) 2024-2026 Arjuna Technologies, Newcastle upon Tyne. All rights reserved. # # This program and the accompanying materials # are made available under the terms of the GNU Public License v3.0. @@ -30,7 +30,7 @@ test_that("numeric meanDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric meanDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time diff --git a/tests/testthat/test-perf-varDS.R b/tests/testthat/test-perf-varDS.R index d468c5da..1e81e646 100644 --- a/tests/testthat/test-perf-varDS.R +++ b/tests/testthat/test-perf-varDS.R @@ -30,7 +30,7 @@ test_that("numeric varDS - performance", { input <- c(0.0, 1.0, 2.0, 3.0, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time @@ -65,7 +65,7 @@ test_that("numeric varDS, with NA - performance", { input <- c(0.0, NA, 2.0, NA, 4.0) - .durationSec <- 30 # seconds + .durationSec <- base::as.integer(base::Sys.getenv("PERF_DURATION_SEC", unset = "30")) # defaults to 30 seconds .count <- 0 .start.time <- Sys.time() .current.time <- .start.time From dd6133f4ad4583339d8756d93ee408383d0729ac Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Tue, 21 Apr 2026 22:08:05 +0100 Subject: [PATCH 2/4] Added libuv1-dev to deployment --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e91b05ad..7eb3e47e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -106,7 +106,7 @@ jobs: sudo apt-get install -qq pkg-config -y sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev libgit2-dev libharfbuzz-dev libfribidi-dev libfontconfig1-dev -y - sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev -y + sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libuv1-dev -y sudo apt-get install -qq r-base -y sudo R -e "install.packages('devtools', dependencies=TRUE)" sudo R -e "install.packages('RANN', dependencies=TRUE)" From d40d899d8076b750b2c6c680092811d25ac6a23f Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 22 Apr 2026 13:10:54 +0100 Subject: [PATCH 3/4] Add 'libuv1' --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a59ed99d..ec6d40e9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,7 @@ jobs: sudo apt-get install -y r-base-core cmake - run: command: | - sudo apt-get install -y libxml2-dev + sudo apt-get install -y libxml2-dev libuv1-dev - run: command: | echo "options(Ncpus=4)" >> ~/.Rprofile From b01c92370763400703729bf9ec15f172f10635e5 Mon Sep 17 00:00:00 2001 From: Stuart Wheater Date: Wed, 22 Apr 2026 14:44:08 +0100 Subject: [PATCH 4/4] Updated version to 'v6.3.6-dev' --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index fabf52d8..18c70ac7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -5,7 +5,7 @@ Description: Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a been designed to only share non disclosive summary statistics, with built in automated output checking based on statistical disclosure control. With data sites setting the threshold values for the automated output checks. For more details, see 'citation("dsBase")'. -Version: 6.3.5 +Version: 6.3.6.9000 Authors@R: c(person(given = "Paul", family = "Burton", role = c("aut"),