Skip to content

Commit baab62b

Browse files
Merge pull request datashield#476 from StuartWheater/v6.3.6-dev
Update of version and adding libuv1
2 parents 6a1b21f + b01c923 commit baab62b

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
sudo apt-get install -y r-base-core cmake
2323
- run:
2424
command: |
25-
sudo apt-get install -y libxml2-dev
25+
sudo apt-get install -y libxml2-dev libuv1-dev
2626
- run:
2727
command: |
2828
echo "options(Ncpus=4)" >> ~/.Rprofile

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Description: Base 'DataSHIELD' functions for the server side. 'DataSHIELD' is a
55
been designed to only share non disclosive summary statistics, with built in automated output
66
checking based on statistical disclosure control. With data sites setting the threshold values for
77
the automated output checks. For more details, see 'citation("dsBase")'.
8-
Version: 6.3.5
8+
Version: 6.3.6.9000
99
Authors@R: c(person(given = "Paul",
1010
family = "Burton",
1111
role = c("aut"),

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ jobs:
106106
107107
sudo apt-get install -qq pkg-config -y
108108
sudo apt-get install -qq libxml2-dev libcurl4-openssl-dev libssl-dev libgit2-dev libharfbuzz-dev libfribidi-dev libfontconfig1-dev -y
109-
sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev -y
109+
sudo apt-get install -qq libfreetype6-dev libpng-dev libtiff5-dev libjpeg-dev libuv1-dev -y
110110
sudo apt-get install -qq r-base -y
111111
sudo R -e "install.packages('devtools', dependencies=TRUE)"
112112
sudo R -e "install.packages('RANN', dependencies=TRUE)"

tests/testthat/test-perf-meanDS.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#-------------------------------------------------------------------------------
2-
# Copyright (c) 2024 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
2+
# Copyright (c) 2024-2026 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.
33
#
44
# This program and the accompanying materials
55
# are made available under the terms of the GNU Public License v3.0.

0 commit comments

Comments
 (0)