Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
329 commits
Select commit Hold shift + click to select a range
b1abc70
Perf profile for R tester
StuartWheater Mar 18, 2025
9ca0acd
Remove superfluous line after return tag, as this was resulting in a …
villegar Apr 22, 2025
6debdab
Replace Author and Maintainer tags with the Authors@R (CRAN note)
villegar Apr 22, 2025
ea6763b
Update of 'Authors@R'
StuartWheater Apr 22, 2025
f5d1baa
Merge pull request #375 from StuartWheater/v6.3.2-dev
StuartWheater Apr 22, 2025
08bed64
Merge branch 'v6.3.2-dev' into master
StuartWheater Apr 22, 2025
cd72fd6
Merge pull request #374 from villegar/master
StuartWheater Apr 22, 2025
3cc3046
Exclude the .github ignore directory from builds, as this results in …
villegar Apr 23, 2025
99a6435
Removed duplicate 'person'
StuartWheater Apr 25, 2025
feb7c06
Merge branch 'datashield:v6.3.2-dev' into v6.3.2-dev
StuartWheater Apr 25, 2025
6860136
Set 'cpus=4' for circleci
StuartWheater Apr 28, 2025
92cc491
Merge branch 'v6.3.2-dev' of github.com:StuartWheater/dsBase into v6.…
StuartWheater Apr 28, 2025
16ca96b
Merge pull request #376 from StuartWheater/v6.3.2-dev
StuartWheater May 2, 2025
58155c3
Update to documentation
StuartWheater May 21, 2025
d834645
Update to documentation
StuartWheater May 21, 2025
000c692
Merge pull request #37 from datashield/v6.3.2-dev
davraam May 27, 2025
fe45793
Adding smk tests for bp_standardsDS
davraam May 28, 2025
e094121
Merge pull request #380 from davraam/v6.3.2-dev
davraam May 28, 2025
b84150c
Update performance profile
StuartWheater May 28, 2025
5d82e58
Merge branch 'v6.3.2-dev' of github.com:StuartWheater/dsBase into v6.…
StuartWheater May 28, 2025
6bc8298
Merge pull request #381 from StuartWheater/v6.3.2-dev
StuartWheater May 28, 2025
96a98ac
add smk tests for gamlssDS
davraam May 29, 2025
452564f
Merge branch 'v6.3.2-dev' of https://github.com/datashield/dsBase int…
davraam May 29, 2025
9039767
Merge pull request #38 from datashield/v6.3.2-dev
davraam May 29, 2025
68fcefb
adding tests for dataFrameSubsetDS functions
davraam May 30, 2025
12ff67c
Merge pull request #382 from davraam/v6.3.2-dev
davraam May 30, 2025
b7368c7
Merge pull request #39 from datashield/v6.3.2-dev
davraam May 30, 2025
1e590fb
add smk test for hetcorDS
davraam Jun 2, 2025
fb853e0
Merge branch 'v6.3.2-dev' of https://github.com/datashield/dsBase int…
davraam Jun 2, 2025
885f5a6
Merge pull request #383 from davraam/v6.3.2-dev
davraam Jun 2, 2025
66bf472
Merge pull request #40 from datashield/v6.3.2-dev
davraam Jun 2, 2025
4fcf034
add smk test for densityGridDS
davraam Jun 2, 2025
ea2eba6
Merge pull request #41 from datashield/v6.3.2-dev
davraam Jun 2, 2025
5882c82
Merge pull request #384 from davraam/v6.3.2-dev
davraam Jun 2, 2025
3f2594d
Updated documents
StuartWheater Jun 2, 2025
c805727
Merge pull request #385 from StuartWheater/v6.3.2-dev
StuartWheater Jun 2, 2025
a2da1b4
Merge pull request #386 from datashield/v6.3.2-dev
StuartWheater Jun 12, 2025
baba9ae
Update version added Yannick
StuartWheater Jun 19, 2025
4ebc059
Merge pull request #387 from StuartWheater/v6.3.3-dev
StuartWheater Jun 19, 2025
f0da9b0
Minor changes for cran
StuartWheater Jun 23, 2025
a645441
Merge branch 'datashield:v6.3.3-dev' into v6.3.3-dev
StuartWheater Jun 23, 2025
f2419c2
Merge pull request #389 from StuartWheater/v6.3.3-dev
StuartWheater Jun 23, 2025
6f2da23
Removed unused test data to reduce size
StuartWheater Jun 29, 2025
17314f9
Merge branch 'v6.3.3-dev' of github.com:StuartWheater/dsBase into v6.…
StuartWheater Jun 29, 2025
2b1f0bc
Update documentation and test data
StuartWheater Jun 30, 2025
19bbea3
Switch to production format version
StuartWheater Jun 30, 2025
c13b443
Update Description
StuartWheater Jul 1, 2025
ea32e8d
Merge pull request #390 from StuartWheater/v6.3.3-dev
StuartWheater Jul 1, 2025
6cd03a6
Update documentation
StuartWheater Jul 1, 2025
411049b
Merge pull request #391 from StuartWheater/v6.3.3-dev
StuartWheater Jul 1, 2025
82175ec
Add Roxygen2 tag @return to indicate the returning object of the func…
villegar Jul 7, 2025
7e6b1de
Add missing Roxygen2 tag @noRd for internal functions
villegar Jul 7, 2025
1497d94
Relocate AggregateMethods, AssignMethods and Options section
villegar Jul 7, 2025
f77117a
New build
villegar Jul 7, 2025
d9d02c6
Update title and description to add single quotes to mentions of Data…
villegar Jul 7, 2025
f84300d
Correct minor typos
villegar Jul 7, 2025
7858508
Replace calls to the print function by message
villegar Jul 7, 2025
0d99285
Relocate options section to .onLoad function
villegar Jul 7, 2025
a217dbc
Replace instances of cat with message
villegar Jul 7, 2025
0b9299c
Correct typo
villegar Jul 7, 2025
bff026d
Reformat code with styler::stile_file
villegar Jul 7, 2025
a8429dc
New build
villegar Jul 7, 2025
efdbe89
Update name of local environment global variable, env >>> ENV
villegar Jul 7, 2025
51e8d55
Add section to back-up the current .Random.seed and revert on.exit
villegar Jul 7, 2025
fa8b54d
New build
villegar Jul 7, 2025
2ebc26d
Add GHA standard checks workflow
villegar Jul 8, 2025
03d3310
Add --as-cran arg
villegar Jul 8, 2025
89e1154
Merge pull request #392 from villegar/v6.3.3-dev
StuartWheater Jul 8, 2025
7c58fe2
Updated and extended perf profiles
StuartWheater Jul 8, 2025
2ca5482
Remove invalid --as-cran flag when building package
villegar Jul 8, 2025
c32e027
Add lines to ignore performance tests on CRAN and GitHub Actions
villegar Jul 8, 2025
51334b8
Update R-CMD-check.yaml
StuartWheater Jul 8, 2025
9b8d8d6
Merge pull request #393 from StuartWheater/v6.3.3-dev
StuartWheater Jul 8, 2025
ff70f7b
Merge pull request #394 from villegar/v6.3.3-dev
StuartWheater Jul 8, 2025
09466bb
Add file with key citations for DataSHIELD
villegar Jul 15, 2025
654e914
Update DESCRIPTION to include reference to the citations
villegar Jul 15, 2025
b9ef5ac
Update documents
StuartWheater Jul 16, 2025
4babeed
Added 'cran-comments'
StuartWheater Jul 16, 2025
89f9256
Add missing bibentry to auto-link the R package citation
villegar Jul 16, 2025
f9330a0
Merge pull request #398 from villegar/v6.3.3-dev
villegar Jul 16, 2025
0ab1039
Merge branch 'datashield:v6.3.3-dev' into v6.3.3-dev
StuartWheater Jul 16, 2025
a1f9b2e
Update documentation and .Rbuildignore: StuartWheater/v6.3.3-dev
StuartWheater Jul 16, 2025
f8e19f3
Added authors and orcids
OllyButters Jul 21, 2025
c17fa3a
Title: Site -> Side
OllyButters Jul 21, 2025
918477c
Skip these tests on Apple M1 architecture, unresolved issue
villegar Jul 21, 2025
f02e492
Merge pull request #400 from OllyButters/v6.3.3-dev
StuartWheater Jul 21, 2025
f2f1231
Update version
StuartWheater Jul 21, 2025
a1f1178
Add CRAN release badge, title, installation instructions and references
villegar Jul 21, 2025
5582620
Correct title and citation for main package
villegar Jul 21, 2025
c5088ce
Add new workflow based on old azure-pipelines.yml file
villegar Jul 21, 2025
1a24b75
Update token variable name
villegar Jul 21, 2025
74a120b
Replace test_package call by test_local
villegar Jul 22, 2025
408a736
Use r-lib custom actions to setup deployment environment and customis…
villegar Jul 22, 2025
06daac3
Install missing package to run checks and tests
villegar Jul 22, 2025
4ead1cf
Add missing environment variable
villegar Jul 22, 2025
a4f0077
Add step with new approach to install devtools
villegar Jul 22, 2025
d66c37a
Add missing workind directory
villegar Jul 22, 2025
a8269e5
Simplify workflow removing unnecessary step
villegar Jul 22, 2025
f489302
Remove additional double quote mark
villegar Jul 22, 2025
7a81c04
Ammend wrong file path and add commands to check current file tree
villegar Jul 22, 2025
a21b0c4
Replace the location of testStatus for development purposes
villegar Jul 22, 2025
f5ac4bc
Update path ../logs >>> logs
villegar Jul 22, 2025
5d2c5cd
Update working directories
villegar Jul 22, 2025
4cfa058
Update git config command and paths to local files
villegar Jul 22, 2025
b872950
Rename workflow and update documentation
villegar Jul 22, 2025
0b8a9c6
Add recursive and verbose flags to cp command
villegar Jul 22, 2025
b8c437d
Simplify copying command for log files
villegar Jul 22, 2025
a51f681
Update user.name for git push
villegar Jul 23, 2025
d961ac0
Rename branchName >> BRANCH_NAME
villegar Jul 23, 2025
2c11650
Rename environment variables from cammel case to all upper case and a…
villegar Jul 23, 2025
b5eada4
Ammend token secret variable name and structure of files
villegar Jul 23, 2025
9a47b4d
Update location of symbolic link
villegar Jul 23, 2025
6680411
Test a new way to get GitHub authentication token
villegar Jul 23, 2025
4023d03
Revert to secrets.DATASHIELD_DEV for token
villegar Jul 23, 2025
152de9b
Change function call for tests: testthat::test_local >> testthat::tes…
villegar Jul 23, 2025
678940b
Add GHA workflow for deployment of package documentation website gene…
villegar Jul 23, 2025
8297d11
Update run tests step to remove direct calls to library
villegar Jul 23, 2025
d1e27c3
Fix quotation marks
villegar Jul 23, 2025
d755066
Revert changes with single/double quotes surrounding code snip
villegar Jul 23, 2025
674ad9b
Merge branch 'datashield:v6.3.3-dev' into v6.3.3-dev
villegar Jul 23, 2025
e41608d
Regenerate documentation with pkgdown::build_site()
villegar Jul 23, 2025
d22f91f
Merge conflicting changes
villegar Jul 23, 2025
fb2780a
Remove superfluous text
villegar Jul 23, 2025
db49482
Fix path for reporter output
villegar Jul 23, 2025
1a6a741
Update symbolic link
villegar Jul 23, 2025
771a91c
Add additional dependencies to run the parser for test results
villegar Jul 24, 2025
e8fed4d
Change working directory to prevent error message when calling git2r:…
villegar Jul 24, 2025
c61416b
Add additional packages to render test report in HTML format
villegar Jul 24, 2025
1c46394
Correct function call render >> quarto_render
villegar Jul 24, 2025
36c3160
Remove additional quotation marks
villegar Jul 24, 2025
dbc689c
Update command to render quarto report
villegar Jul 24, 2025
23a22bf
Fix location of input for quarto_render command
villegar Jul 24, 2025
f9b4ca7
Add line for debugging
villegar Jul 24, 2025
b6f86df
Set up local environment variables
villegar Jul 24, 2025
510422a
Add missing portion of path
villegar Jul 24, 2025
2c26a06
Rename DATETIME to WORKFLOW_ID and update path to logs: ../logs >> logs
villegar Jul 24, 2025
fdfca18
Revert path to match the working directory structure of the quarto_re…
villegar Jul 24, 2025
4078d70
Add missing dependencies and change output file for quarto_render
villegar Jul 24, 2025
5e779b8
Correct name of output file from quarto_render: index.html >> test_re…
villegar Jul 24, 2025
b025cf1
Replace symbolic link with copy of the latest render of the test repo…
villegar Jul 24, 2025
260419f
Test removing unused token
villegar Jul 24, 2025
f8a4141
Update token name
villegar Jul 24, 2025
f6c657c
Fix path to latest documentation directory
villegar Jul 25, 2025
32b9639
Update name of workflow
villegar Jul 25, 2025
56c19d2
Changes from villegar/v6.3.3-dev into v6.3.4-dev
StuartWheater Jul 25, 2025
b45cd42
Update branches and simplify schedules
villegar Jul 25, 2025
fd1149e
Merge pull request #402 from datashield/v6.3.3-dev
StuartWheater Jul 25, 2025
a9cfef5
Test changing token location
villegar Jul 25, 2025
891d9dd
Add contents writing permission
villegar Jul 25, 2025
55e7a37
Add test-coverage GHA workflow
villegar Jul 28, 2025
260f178
Add badge for test coverage
villegar Jul 28, 2025
5238e32
Role back to custom token for deploying changes to testStatus
villegar Jul 28, 2025
e3ff123
Merge pull request #403 from villegar/v6.3.4-dev
StuartWheater Jul 28, 2025
acdd3fb
Added 'carrot' privacy level
StuartWheater Aug 1, 2025
4bc866b
Fix typo in cbindDS.R
StuartWheater Aug 6, 2025
4706682
Update DATASHIELD
StuartWheater Aug 6, 2025
82b254b
Rework Options
StuartWheater Aug 6, 2025
21f85c9
Merge branch 'v6.3.4-dev' of github.com:datashield/dsBase into v6.3.4…
StuartWheater Aug 6, 2025
846c9a0
Switched to 'permissive'
StuartWheater Aug 6, 2025
8570bcf
Merge pull request #404 from StuartWheater/v6.3.4-dev-permissive
StuartWheater Aug 7, 2025
464c150
Added '.Random.seed' to 'utils::globalVariables'
StuartWheater Aug 8, 2025
36ea81b
Merge pull request #34 from StuartWheater/v6.3.4-dev
StuartWheater Aug 8, 2025
07e4dfb
Merge pull request #405 from StuartWheater/v6.3.4-dev
StuartWheater Aug 10, 2025
6915d92
Merge pull request #406 from StuartWheater/v6.3.4-dev-permissive
StuartWheater Aug 10, 2025
21bb210
Merge pull request #407 from datashield/v6.3.4-dev
StuartWheater Aug 12, 2025
ee47a80
Rework restoring '.Random.seed'
StuartWheater Aug 12, 2025
4690798
Merge branch 'v6.3.4-dev' of github.com:StuartWheater/dsBase into v6.…
StuartWheater Aug 12, 2025
745a0d9
Merge branch 'v6.3.4-dev-feat_carrot' into v6.3.4-dev
StuartWheater Aug 12, 2025
7ba21e7
Merge pull request #36 from StuartWheater/v6.3.4-dev
StuartWheater Aug 12, 2025
9ec0e49
Merge pull request #408 from StuartWheater/v6.3.4-dev-feat_carrot
StuartWheater Aug 12, 2025
bfd95ec
Merge pull request #409 from datashield/master
StuartWheater Aug 12, 2025
01c33cd
Merge pull request #411 from datashield/v6.3.4-dev-permissive
StuartWheater Aug 12, 2025
85a5529
Switch back to 'banana'
StuartWheater Aug 13, 2025
bc6b2d3
Merge pull request #413 from StuartWheater/v6.3.4-dev
StuartWheater Aug 13, 2025
bd483bd
Rework access to 'old_seed'
StuartWheater Aug 13, 2025
90dcb61
Update global.R
StuartWheater Aug 13, 2025
c81e5ed
Switch 'old_seed' to '.old_seed'
StuartWheater Aug 13, 2025
715c4f6
Merge pull request #416 from StuartWheater/v6.3.4-dev
StuartWheater Aug 14, 2025
1694677
Update version
StuartWheater Aug 18, 2025
2c209f0
Update docs
StuartWheater Aug 18, 2025
a238a20
Merge pull request #417 from StuartWheater/v6.3.4-dev
StuartWheater Aug 18, 2025
8b386dc
Fix typos
villegar Aug 20, 2025
16942f7
Correct citations
villegar Aug 20, 2025
675bc98
New build
villegar Aug 20, 2025
77da88a
Merge pull request #418 from villegar/v6.3.4-dev
StuartWheater Aug 20, 2025
e9357d4
Merge pull request #38 from datashield/v6.3.4-dev
StuartWheater Aug 20, 2025
03cb1c3
Update parts of docs
StuartWheater Aug 20, 2025
c3cff37
Merge pull request #419 from StuartWheater/v6.3.4-dev
villegar Aug 21, 2025
675dc5f
Set up language for the package (en-GB) and add list of word exceptions
villegar Aug 21, 2025
a198f9f
Add documentation for package, ?dsBase
villegar Aug 21, 2025
e3f0b13
Regenerate documentationa after setting up default language, en-GB
villegar Aug 21, 2025
a9f1ae2
Update version to match next release
villegar Aug 21, 2025
1260e0b
Update dsBase test suite workflow to be executed on pull_requests and…
villegar Aug 21, 2025
57905f3
Remove on pull_request as secrets.GH_TOKEN is not available in this c…
villegar Aug 21, 2025
f4e5182
Merge pull request #420 from villegar/v6.3.4-dev
StuartWheater Aug 21, 2025
2362021
Remove flag skip_on_os to skip these tests on Apple M1 architecture. …
villegar Aug 22, 2025
d3e78af
Remove invalid test for when the approximation of t-stat is Inf, resu…
villegar Aug 22, 2025
b8e80af
Replace test for Apple Mx processors without assumptions of tolerance…
Aug 22, 2025
a57c91a
Merge pull request #422 from villegar/v6.3.4-dev
StuartWheater Aug 23, 2025
9d74b26
Roll back changes done to the test 'simple corTestDS, some, with na, …
Aug 26, 2025
b974f96
Merge pull request #423 from villegar/v6.3.4-dev
StuartWheater Aug 26, 2025
e6c3bcb
Update doc timestamps
StuartWheater Aug 28, 2025
8498fd4
Merge pull request #424 from StuartWheater/v6.3.4-dev
StuartWheater Aug 28, 2025
719d918
Reconfigure script to push changes to testStatus on pull request
villegar Sep 2, 2025
3f622e2
Remove installation of dependencies via auto detection
villegar Sep 2, 2025
7fac258
Relocate the dependencies: NA keyword
villegar Sep 2, 2025
7d5be42
Minor change to dependencies value
villegar Sep 2, 2025
9827d98
Update unrecognised R expression false >>> 'FALSE'
villegar Sep 2, 2025
2ba2a13
Add missing dependencies for checking package, fs and usethis
villegar Sep 2, 2025
41adaf8
Add new packages for checks: cli and rlang
villegar Sep 2, 2025
db997e9
Add ellipsis and glue
villegar Sep 2, 2025
7c99ea2
Add lifecycle
villegar Sep 2, 2025
cf7f02b
Add memoise and vctrs
villegar Sep 2, 2025
3df6f48
Add cachem
villegar Sep 2, 2025
ae31b65
Add fastmap
villegar Sep 2, 2025
56ea438
Add missing dependencies, extracted with pak
villegar Sep 2, 2025
ee00594
Remove dependency local::.
villegar Sep 2, 2025
eed38f4
Add shiny as a dependency and remove duplicates
villegar Sep 2, 2025
5b850d0
Add dependencies of key packages
villegar Sep 2, 2025
0ed63c4
Update reference to dependencies
villegar Sep 2, 2025
cc26524
Remove the ExactData dependency as the drat server in which is hosted…
villegar Sep 2, 2025
28cbdf2
Remove the RDCOMClient package
villegar Sep 2, 2025
0de2872
Add Bioconductor dependency, BiocGenerics
villegar Sep 2, 2025
94562e4
Add generics to list of dependencies
villegar Sep 3, 2025
b2af530
Add step for local installation of dsBase and revert changes done to …
villegar Sep 3, 2025
ccd1bb6
Fix invalid notation in new step
villegar Sep 3, 2025
47ac437
Simplify notation
villegar Sep 3, 2025
41591d6
Remove duplicated 'with' section
villegar Sep 3, 2025
3493307
Add dependencies for dsBase
villegar Sep 3, 2025
617de47
Skip dependencies
villegar Sep 3, 2025
e79ece2
Remove single quotes from dependencies: 'FALSE'
villegar Sep 3, 2025
facd068
Replace FALSE by `FALSE`
villegar Sep 3, 2025
d5c4ba2
Add missing single quotes for dependencies value
villegar Sep 3, 2025
4a0882a
Fix invalid R expression pass to dependencies
villegar Sep 3, 2025
457802b
Replace skipping auto detection of dependencies
villegar Sep 3, 2025
f48889b
Add usethis and devtools
villegar Sep 3, 2025
6ba90c3
Update Roxygen to version '7.3.3'
StuartWheater Sep 5, 2025
15c69a4
Merge pull request #425 from villegar/v6.3.4-dev
OllyButters Sep 5, 2025
85bd6b2
Merge branch 'datashield:v6.3.4-dev' into v6.3.4-dev
StuartWheater Sep 5, 2025
d7d0f89
Merge pull request #426 from StuartWheater/v6.3.4-dev
StuartWheater Sep 5, 2025
83cf89e
Addition of noLD note
StuartWheater Sep 17, 2025
1142804
Update for noLD note
StuartWheater Sep 17, 2025
c88dfc5
Docs update
StuartWheater Sep 17, 2025
b78506b
Update README.md
villegar Sep 17, 2025
0994f7c
Update index.html
villegar Sep 17, 2025
67ba65a
Merge pull request #427 from StuartWheater/v6.3.4-dev
StuartWheater Sep 17, 2025
17cebc0
Update workflow to avoid relying on external PAT (secrets.GH_TOKEN) a…
villegar Sep 20, 2025
ea12b73
Update to 6.3.4
StuartWheater Sep 21, 2025
2ddfebf
Update with released 6.3.4
StuartWheater Sep 21, 2025
3563df7
Merge pull request #428 from villegar/v6.3.5-dev
villegar Sep 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
^data$
^docs$
^pkgdown$
^\.circleci$
^\.circleci/config\.yml$
^\.github$
^cran-comments\.md$
51 changes: 51 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Copyright (c) 2024 Arjuna Technologies, Newcastle upon Tyne. All rights reserved.

version: 2.1

jobs:
dsbase:
docker:
- image: cimg/base:current
resource_class: small
steps:
- checkout
- setup_remote_docker:
docker_layout_caching: true
- run: |
echo "Building"
echo " Repo Name: " $CIRCLE_PROJECT_REPONAME
echo " Branch: " $CIRCLE_BRANCH
echo " Tag: " $CIRCLE_TAG
- run:
command: |
sudo apt-get update -y
sudo apt-get install -y r-base-core cmake
- run:
command: |
sudo apt-get install -y libxml2-dev
- run:
command: |
echo "options(Ncpus=4)" >> ~/.Rprofile
sudo Rscript -e "install.packages('RANN', dependencies=TRUE)"
sudo Rscript -e "install.packages('stringr', dependencies=TRUE)"
sudo Rscript -e "install.packages('lme4', dependencies=TRUE)"
sudo Rscript -e "install.packages('dplyr', dependencies=TRUE)"
sudo Rscript -e "install.packages('reshape2', dependencies=TRUE)"
sudo Rscript -e "install.packages('polycor', dependencies=TRUE)"
sudo Rscript -e "install.packages('splines', dependencies=TRUE)"
sudo Rscript -e "install.packages('gamlss', dependencies=TRUE)"
sudo Rscript -e "install.packages('gamlss.dist', dependencies=TRUE)"
sudo Rscript -e "install.packages('mice', dependencies=TRUE)"
sudo Rscript -e "install.packages('childsds', dependencies=TRUE)"
sudo Rscript -e "install.packages('xml2', dependencies=TRUE)"
sudo Rscript -e "install.packages('covr', dependencies=TRUE)"
sudo Rscript -e "install.packages('devtools', dependencies=TRUE)"
sudo Rscript -e "install.packages('DSI', dependencies=TRUE)"
sudo Rscript -e "install.packages('DSLite', dependencies=TRUE)"
- run:
command: |
sudo Rscript -e 'library(covr); covr::codecov(token = "'$CODECOV_TOKEN'")'
workflows:
build:
jobs:
- dsbase
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
51 changes: 51 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:

name: R-CMD-check.yaml

permissions: read-all

jobs:
R-CMD-check:
runs-on: ${{ matrix.config.os }}

name: ${{ matrix.config.os }} (${{ matrix.config.r }})

strategy:
fail-fast: false
matrix:
config:
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v2
with:
upload-snapshots: true
build_args: 'c("--no-manual", "--compact-vignettes=gs+qpdf")'
209 changes: 209 additions & 0 deletions .github/workflows/dsBase_test_suite.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
################################################################################
# DataSHIELD GHA test suite - dsBase
# Adapted from `azure-pipelines.yml` by Roberto Villegas-Diaz
#
# Inside the root directory $(Pipeline.Workspace) will be a file tree like:
# /dsBase <- Checked out version of datashield/dsBase
# /dsBase/logs <- Where results of tests and logs are collated
# /testStatus <- Checked out version of datashield/testStatus
#
# As of Jul 2025 this takes ~ 9 mins to run.
################################################################################
name: dsBase tests' suite

on:
push:
schedule:
- cron: '0 0 * * 0' # Weekly
- cron: '0 1 * * *' # Nightly

jobs:
dsBase_test_suite:
runs-on: ubuntu-latest
timeout-minutes: 120
permissions:
contents: write

# These should all be constant, except TEST_FILTER. This can be used to test
# subsets of test files in the testthat directory. Options are like:
# '*' <- Run all tests.
# 'asNumericDS*' <- Run all asNumericDS tests, i.e. all the arg, etc. tests.
# '*_smk_*' <- Run all the smoke tests for all functions.
env:
TEST_FILTER: '*'
_r_check_system_clock_: 0
WORKFLOW_ID: ${{ github.run_id }}-${{ github.run_attempt }}
PROJECT_NAME: dsBase
BRANCH_NAME: ${{ github.ref_name }}
REPO_OWNER: ${{ github.repository_owner }}
R_KEEP_PKG_SOURCE: yes
GITHUB_TOKEN: ${{ github.token || 'placeholder-token' }}

steps:
- name: Checkout dsBase
uses: actions/checkout@v4
with:
path: dsBase

- name: Checkout testStatus
if: ${{ github.actor != 'nektos/act' }} # for local deployment only
uses: actions/checkout@v4
with:
repository: ${{ env.REPO_OWNER }}/testStatus
ref: master
path: testStatus
persist-credentials: false
token: ${{ env.GITHUB_TOKEN }}

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
r-version: release
http-user-agent: release
use-public-rspm: true

- name: Install dsBase
run: |
Rscript -e 'install.packages(c("RANN", "stringr", "lme4", "dplyr", "reshape2", "polycor", "gamlss", "gamlss.dist", "mice", "childsds", "usethis", "devtools"), dependencies = TRUE)'
R CMD INSTALL ./dsBase

- uses: r-lib/actions/setup-r-dependencies@v2
with:
dependencies: 'c("Imports")'
extra-packages: |
any::rcmdcheck
cran::devtools
cran::git2r
cran::RCurl
cran::readr
cran::magrittr
cran::xml2
cran::purrr
cran::dplyr
cran::stringr
cran::tidyr
cran::quarto
cran::knitr
cran::kableExtra
cran::rmarkdown
cran::downlit
needs: check

- name: Check man files up-to-date
run: |
orig_sum=$(find man -type f | sort -u | xargs cat | md5sum)
R -e "devtools::document()"
new_sum=$(find man -type f | sort -u | xargs cat | md5sum)
if [ "$orig_sum" != "$new_sum" ]; then
echo "Your committed manual files (man/*.Rd) are out of sync with the R files. Run devtools::document() locally then commit."
exit 1
else
echo "Documentation up-to-date."
fi
working-directory: dsBase
continue-on-error: true

- name: Run devtools::check
run: |
R -q -e "library('devtools'); devtools::check(args = c('--no-tests', '--no-examples'))" | tee ../check.Rout
grep -q "^0 errors" ../check.Rout && grep -q " 0 warnings" ../check.Rout && grep -q " 0 notes" ../check.Rout
working-directory: dsBase
continue-on-error: true

- name: Run tests with coverage & JUnit report
run: |
mkdir -p logs
R -q -e "devtools::reload();"
R -q -e '
write.csv(
covr::coverage_to_list(
covr::package_coverage(
type = c("none"),
code = c('"'"'
output_file <- file("test_console_output.txt");
sink(output_file);
sink(output_file, type = "message");
junit_rep <- testthat::JunitReporter$new(file = file.path(getwd(), "test_results.xml"));
progress_rep <- testthat::ProgressReporter$new(max_failures = 999999);
multi_rep <- testthat::MultiReporter$new(reporters = list(progress_rep, junit_rep));
testthat::test_package("${{ env.PROJECT_NAME }}", filter = "${{ env.TEST_FILTER }}", reporter = multi_rep, stop_on_failure = FALSE)'"'"'
)
)
),
"coveragelist.csv"
)'

mv coveragelist.csv logs/
mv test_* logs/
grep -q " FAIL 0 " logs/test_console_output.txt
working-directory: dsBase

- name: Check for JUnit errors
run: |
issue_count=$(sed 's/failures="0" errors="0"//' test_results.xml | grep -c errors= || true)
echo "Number of testsuites with issues: $issue_count"
sed 's/failures="0" errors="0"//' test_results.xml | grep errors= > issues.log || true
cat issues.log || true
exit $issue_count
working-directory: dsBase/logs

- name: Write versions to file
run: |
echo "branch:${{ env.BRANCH_NAME }}" > ${{ env.WORKFLOW_ID }}.txt
echo "os:$(lsb_release -ds)" >> ${{ env.WORKFLOW_ID }}.txt
echo "R:$(R --version | head -n1)" >> ${{ env.WORKFLOW_ID }}.txt
working-directory: dsBase/logs

- name: Parse results from testthat and covr
run: |
Rscript --verbose --vanilla ../testStatus/source/parse_test_report.R logs/
working-directory: dsBase

- name: Render report
run: |
cd testStatus

mkdir -p new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
mkdir -p new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
mkdir -p new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/latest/

# Copy logs to new logs directory location
cp -rv ../${{ env.PROJECT_NAME }}/logs/* new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/
cp -rv ../${{ env.PROJECT_NAME }}/logs/${{ env.WORKFLOW_ID }}.txt new/logs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/

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))'
mv source/test_report.html new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/index.html
cp -r new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/${{ env.WORKFLOW_ID }}/* new/docs/${{ env.PROJECT_NAME }}/${{ env.BRANCH_NAME }}/latest

env:
PROJECT_NAME: ${{ env.PROJECT_NAME }}
BRANCH_NAME: ${{ env.BRANCH_NAME }}
WORKFLOW_ID: ${{ env.WORKFLOW_ID }}

- name: Upload test logs
uses: actions/upload-artifact@v4
with:
name: dsbase-logs
path: testStatus/new

- name: Dump environment info
run: |
echo -e "\n#############################"
echo -e "ls /: ######################"
ls -al .
echo -e "\n#############################"
echo -e "lscpu: ######################"
lscpu
echo -e "\n#############################"
echo -e "memory: #####################"
free -m
echo -e "\n#############################"
echo -e "env: ########################"
env
echo -e "\n#############################"
echo -e "R sessionInfo(): ############"
R -e 'sessionInfo()'
sudo apt install tree -y
tree .

49 changes: 49 additions & 0 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main, master]
pull_request:
release:
types: [published]
workflow_dispatch:

name: pkgdown.yaml

permissions: read-all

jobs:
pkgdown:
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
permissions:
contents: write
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::pkgdown, local::.
needs: website

- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
Loading
Loading