Skip to content

Commit 141229f

Browse files
Merge pull request #448 from datashield/v6.3.5-dev
V6.3.5 dev
2 parents 4177ac5 + 5ae71ec commit 141229f

145 files changed

Lines changed: 431 additions & 292 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.

.github/workflows/dsBase_test_suite.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ on:
1515
push:
1616
schedule:
1717
- cron: '0 0 * * 0' # Weekly
18-
- cron: '0 1 * * *' # Nightly
1918

2019
jobs:
2120
dsBase_test_suite:
@@ -153,28 +152,30 @@ jobs:
153152
echo "branch:${{ env.BRANCH_NAME }}" > ${{ env.WORKFLOW_ID }}.txt
154153
echo "os:$(lsb_release -ds)" >> ${{ env.WORKFLOW_ID }}.txt
155154
echo "R:$(R --version | head -n1)" >> ${{ env.WORKFLOW_ID }}.txt
155+
Rscript --vanilla -e 'sessionInfo()' >> session_info_${{ env.WORKFLOW_ID }}.txt
156156
working-directory: dsBase/logs
157157

158158
- name: Parse results from testthat and covr
159159
run: |
160-
Rscript --verbose --vanilla ../testStatus/source/parse_test_report.R logs/
160+
Rscript --verbose --vanilla ../testStatus/source/parse_test_report.R logs/ logs/ https://github.com/datashield/${{ env.PROJECT_NAME }}/blob/${{ env.BRANCH_NAME }} '[^-:.]+' '(?<=::)[^:]+(?=::)'
161161
working-directory: dsBase
162+
env:
163+
PROJECT_NAME: ${{ env.PROJECT_NAME }}
164+
BRANCH_NAME: ${{ env.BRANCH_NAME }}
162165

163166
- name: Render report
164167
run: |
165168
cd testStatus
166169
167170
mkdir -p new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
168-
mkdir -p new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
169171
mkdir -p new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/latest/
170172
171173
# Copy logs to new logs directory location
172174
cp -rv ../${{ env.PROJECT_NAME }}/logs/* new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
173175
cp -rv ../${{ env.PROJECT_NAME }}/logs/${{ env.WORKFLOW_ID }}.txt new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
174176
175177
R -e 'input_dir <- file.path("../new/logs", Sys.getenv("PROJECT_NAME"), Sys.getenv("BRANCH_NAME"), Sys.getenv("WORKFLOW_ID")); quarto::quarto_render("source/test_report.qmd", execute_params = list(input_dir = input_dir))'
176-
mv source/test_report.html new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/index.html
177-
cp -r new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/* new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/latest
178+
mv source/test_report.html new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/latest/index.html
178179
179180
env:
180181
PROJECT_NAME: ${{ env.PROJECT_NAME }}

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.4
8+
Version: 6.3.5.9000
99
Authors@R: c(person(given = "Paul",
1010
family = "Burton",
1111
role = c("aut"),

docs/404.html

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

docs/LICENSE.html

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

docs/authors.html

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

docs/index.html

Lines changed: 2 additions & 2 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.3
2+
pkgdown: 2.2.0
33
pkgdown_sha: ~
44
articles: {}
5-
last_built: 2025-09-17T15:04Z
5+
last_built: 2025-11-30T16:44Z

docs/reference/BooleDS.html

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

docs/reference/absDS.html

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

docs/reference/asCharacterDS.html

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

0 commit comments

Comments
 (0)