From e356adbb13659cbaec7f0609dd1630633ae20c21 Mon Sep 17 00:00:00 2001 From: walkowif <59475134+walkowif@users.noreply.github.com> Date: Mon, 16 Sep 2024 16:29:48 +0200 Subject: [PATCH 1/4] Workflow propagations (#206) Propagation of: * https://github.com/insightsengineering/idr-tasks/issues/804 * https://github.com/insightsengineering/idr-tasks/issues/810 --- .github/workflows/check.yaml | 3 +++ .github/workflows/release.yaml | 3 +++ .github/workflows/scheduled.yaml | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 6c76857df..8b216ef33 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -60,6 +60,9 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + additional-env-vars: | + NOT_CRAN=true roxygen: name: Roxygen ๐Ÿ…พ uses: insightsengineering/r.pkg.template/.github/workflows/roxygen.yaml@main diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ffd6b68ef..13273d4a2 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -50,6 +50,9 @@ jobs: uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} + with: + additional-env-vars: | + NOT_CRAN=true wasm: name: Build WASM packages ๐Ÿง‘โ€๐Ÿญ needs: release diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 139ef79eb..5b532f030 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -5,9 +5,26 @@ on: schedule: - cron: '45 3 * * 0' workflow_dispatch: + inputs: + chosen-workflow: + description: | + Select which workflow you'd like to run + required: true + type: choice + default: rhub + options: + - rhub + - dependency-test + - branch-cleanup + - revdepcheck jobs: dependency-test: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'dependency-test' + ) strategy: fail-fast: false matrix: @@ -22,6 +39,11 @@ jobs: additional-env-vars: | PKG_SYSREQS_DRY_RUN=true branch-cleanup: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'branch-cleanup' + ) name: Branch Cleanup ๐Ÿงน uses: insightsengineering/r.pkg.template/.github/workflows/branch-cleanup.yaml@main secrets: @@ -34,9 +56,19 @@ jobs: with: issue-assignees: "ddsjoberg" revdepcheck: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'revdepcheck' + ) name: revdepcheck โ†ฉ๏ธ uses: insightsengineering/r.pkg.template/.github/workflows/revdepcheck.yaml@main rhub: + if: > + github.event_name == 'schedule' || ( + github.event_name == 'workflow_dispatch' && + inputs.chosen-workflow == 'rhub' + ) name: R-hub ๐ŸŒ uses: insightsengineering/r.pkg.template/.github/workflows/rhub.yaml@main with: From 2d4399170e7105d0ae47d05e9ebc10ac0bd58425 Mon Sep 17 00:00:00 2001 From: cicdguy Date: Mon, 16 Sep 2024 14:30:43 +0000 Subject: [PATCH 2/4] [skip actions] Bump version to 0.2.1.9002 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a98e40e80..4ae235a96 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: cardx Title: Extra Analysis Results Data Utilities -Version: 0.2.1.9001 +Version: 0.2.1.9002 Authors@R: c( person("Daniel", "Sjoberg", , "danield.sjoberg@gmail.com", role = c("aut", "cre")), person("Abinaya", "Yogasekaram", , "abinaya.yogasekaram@contractors.roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index e6f6e5838..878c17c72 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# cardx 0.2.1.9001 +# cardx 0.2.1.9002 # cardx 0.2.1 From 9970baad97d8f813fe0570fa7c9467c65d5597ba Mon Sep 17 00:00:00 2001 From: Joe Zhu Date: Wed, 18 Sep 2024 21:30:04 +0800 Subject: [PATCH 3/4] align lme4 version with current rspm version (#211) set lme4 version to 1.1-35.3 to align with rspm --- .github/workflows/scheduled.yaml | 2 ++ DESCRIPTION | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml index 5b532f030..6602027b6 100644 --- a/.github/workflows/scheduled.yaml +++ b/.github/workflows/scheduled.yaml @@ -38,6 +38,8 @@ jobs: strategy: ${{ matrix.test-strategy }} additional-env-vars: | PKG_SYSREQS_DRY_RUN=true + extra-deps: | + lme4 (>= 1.1-35) branch-cleanup: if: > github.event_name == 'schedule' || ( diff --git a/DESCRIPTION b/DESCRIPTION index 4ae235a96..5dac3968b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -36,7 +36,7 @@ Suggests: emmeans (>= 1.7.3), geepack (>= 1.3.2), ggsurvfit (>= 1.1.0), - lme4 (>= 1.1-35.5), + lme4 (>= 1.1-35.3), parameters (>= 0.20.2), smd (>= 0.6.6), spelling (>= 2.3.0), From 5e69ba42a02e03f25bb75add6cc43ec80fa199e4 Mon Sep 17 00:00:00 2001 From: ddsjoberg Date: Wed, 18 Sep 2024 13:31:00 +0000 Subject: [PATCH 4/4] [skip actions] Bump version to 0.2.1.9003 --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5dac3968b..a53bbe85e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: cardx Title: Extra Analysis Results Data Utilities -Version: 0.2.1.9002 +Version: 0.2.1.9003 Authors@R: c( person("Daniel", "Sjoberg", , "danield.sjoberg@gmail.com", role = c("aut", "cre")), person("Abinaya", "Yogasekaram", , "abinaya.yogasekaram@contractors.roche.com", role = "aut"), diff --git a/NEWS.md b/NEWS.md index 878c17c72..4170b8500 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# cardx 0.2.1.9002 +# cardx 0.2.1.9003 # cardx 0.2.1