Skip to content

Commit 8b1944f

Browse files
Merge pull request datashield#576 from StuartWheater/v6.3.2-dev
Updates for RC1
2 parents fb670a4 + 3c2e11b commit 8b1944f

154 files changed

Lines changed: 498 additions & 458 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: dsBaseClient
22
Title: DataSHIELD Client Functions
3-
Version: 6.3.2.9000
3+
Version: 6.3.2
44
Authors@R: c(person(given = "Paul",
55
family = "Burton",
66
role = c("aut")),

armadillo_azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ schedules:
5858
- master
5959
always: true
6060
- cron: "0 2 * * *"
61-
displayName: Nightly build - v6.3.1-dev
61+
displayName: Nightly build - v6.3.2-dev
6262
branches:
6363
include:
64-
- v6.3.1-dev
64+
- v6.3.2-dev
6565
always: true
6666

6767
#########################################################################################
@@ -235,7 +235,7 @@ jobs:
235235
236236
curl -u admin:admin -X GET http://localhost:8080/packages
237237
238-
curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.1-permissive.tar.gz" -X POST http://localhost:8080/install-package
238+
curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.2-permissive.tar.gz" -X POST http://localhost:8080/install-package
239239
sleep 60
240240
241241
docker container restart dsbaseclient_armadillo_1
@@ -364,7 +364,7 @@ jobs:
364364
- bash: |
365365
curl -u admin:admin http://localhost:8080/whitelist
366366
367-
curl -u admin:admin -v -H 'Content-Type: multipart/form-data' -F "file=@dsDanger_6.3.1.tar.gz" -X POST http://localhost:8080/install-package
367+
curl -u admin:admin -v -H 'Content-Type: multipart/form-data' -F "file=@dsDanger_6.3.2.tar.gz" -X POST http://localhost:8080/install-package
368368
369369
docker container restart dsbaseclient_armadillo_1
370370
sleep 60

azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ schedules:
5858
- master
5959
always: true
6060
- cron: "0 2 * * *"
61-
displayName: Nightly build - v6.3.1-dev
61+
displayName: Nightly build - v6.3.2-dev
6262
branches:
6363
include:
64-
- v6.3.1-dev
64+
- v6.3.2-dev
6565
always: true
6666

6767
#########################################################################################
@@ -140,7 +140,7 @@ jobs:
140140
sudo R -q -e "install.packages(c('MolgenisAuth', 'MolgenisArmadillo', 'DSMolgenisArmadillo'), dependencies=TRUE, repos='https://cloud.r-project.org')"
141141
sudo R -q -e "install.packages(c('DescTools','e1071'), dependencies=TRUE, repos='https://cloud.r-project.org')"
142142
143-
sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='6.3.1', dependencies = TRUE)"
143+
sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='6.3.2', dependencies = TRUE)"
144144
145145
# XML grep for coverage report merging
146146
sudo apt-get install -qq xml-twig-tools -y
@@ -235,7 +235,7 @@ jobs:
235235
- bash: |
236236
R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'https://localhost:8443', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(o)"
237237
238-
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.3.1'); opal.logout(opal)"
238+
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='https://localhost:8443/', opts = list(ssl_verifyhost=0, ssl_verifypeer=0)); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = '6.3.2'); opal.logout(opal)"
239239
240240
sleep 60
241241

docker-compose_armadillo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
hostname: armadillo
44
ports:
55
- 8080:8080
6-
image: datashield/armadillo_citest:5.0.0
6+
image: datashield/armadillo_citest:5.0.0.2
77
environment:
88
LOGGING_CONFIG: 'classpath:logback-file.xml'
99
AUDIT_LOG_PATH: '/app/logs/audit.log'
@@ -16,6 +16,6 @@ services:
1616

1717
default:
1818
hostname: default
19-
image: datashield/rock-margin-hammer-permissive:latest
19+
image: datashield/rserver-neutron:latest
2020
environment:
2121
DEBUG: "FALSE"

docker-compose_opal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
opal:
3-
image: obiba/opal:5.1.2
3+
image: obiba/opal:5.1.3
44
ports:
55
- "8443:8443"
66
links:

docs/404.html

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/LICENSE.html

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/authors.html

Lines changed: 40 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/index.html

Lines changed: 12 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/pkgdown.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
pandoc: 3.1.3
2-
pkgdown: 2.1.1
2+
pkgdown: 2.1.2
33
pkgdown_sha: ~
44
articles: {}
5-
last_built: 2025-03-10T14:20Z
5+
last_built: 2025-05-21T10:56Z

0 commit comments

Comments
 (0)