Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: dsBaseClient
Title: DataSHIELD Client Functions
Version: 6.3.2.9000
Version: 6.3.2
Authors@R: c(person(given = "Paul",
family = "Burton",
role = c("aut")),
Expand Down
8 changes: 4 additions & 4 deletions armadillo_azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ schedules:
- master
always: true
- cron: "0 2 * * *"
displayName: Nightly build - v6.3.1-dev
displayName: Nightly build - v6.3.2-dev
branches:
include:
- v6.3.1-dev
- v6.3.2-dev
always: true

#########################################################################################
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:

curl -u admin:admin -X GET http://localhost:8080/packages

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
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
sleep 60

docker container restart dsbaseclient_armadillo_1
Expand Down Expand Up @@ -364,7 +364,7 @@ jobs:
- bash: |
curl -u admin:admin http://localhost:8080/whitelist

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
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

docker container restart dsbaseclient_armadillo_1
sleep 60
Expand Down
8 changes: 4 additions & 4 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ schedules:
- master
always: true
- cron: "0 2 * * *"
displayName: Nightly build - v6.3.1-dev
displayName: Nightly build - v6.3.2-dev
branches:
include:
- v6.3.1-dev
- v6.3.2-dev
always: true

#########################################################################################
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
sudo R -q -e "install.packages(c('MolgenisAuth', 'MolgenisArmadillo', 'DSMolgenisArmadillo'), dependencies=TRUE, repos='https://cloud.r-project.org')"
sudo R -q -e "install.packages(c('DescTools','e1071'), dependencies=TRUE, repos='https://cloud.r-project.org')"

sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='6.3.1', dependencies = TRUE)"
sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='6.3.2', dependencies = TRUE)"

# XML grep for coverage report merging
sudo apt-get install -qq xml-twig-tools -y
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
- bash: |
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)"

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)"
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)"

sleep 60

Expand Down
4 changes: 2 additions & 2 deletions docker-compose_armadillo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
hostname: armadillo
ports:
- 8080:8080
image: datashield/armadillo_citest:5.0.0
image: datashield/armadillo_citest:5.0.0.2
environment:
LOGGING_CONFIG: 'classpath:logback-file.xml'
AUDIT_LOG_PATH: '/app/logs/audit.log'
Expand All @@ -16,6 +16,6 @@ services:

default:
hostname: default
image: datashield/rock-margin-hammer-permissive:latest
image: datashield/rserver-neutron:latest
environment:
DEBUG: "FALSE"
2 changes: 1 addition & 1 deletion docker-compose_opal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
opal:
image: obiba/opal:5.1.2
image: obiba/opal:5.1.3
ports:
- "8443:8443"
links:
Expand Down
6 changes: 3 additions & 3 deletions docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/LICENSE.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 40 additions & 8 deletions docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 12 additions & 4 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pandoc: 3.1.3
pkgdown: 2.1.1
pkgdown: 2.1.2
pkgdown_sha: ~
articles: {}
last_built: 2025-03-10T14:20Z
last_built: 2025-05-21T10:56Z
6 changes: 3 additions & 3 deletions docs/reference/checkClass.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/colPercent.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/ds.Boole.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/ds.abs.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions docs/reference/ds.asCharacter.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading