Skip to content

Commit

Permalink
Merge branch 'main' into 929_bug_fixes_and_init_pagination@main
Browse files Browse the repository at this point in the history
  • Loading branch information
Melkiades authored Sep 18, 2024
2 parents cf3d24d + 13b95e0 commit 342be6c
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,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
linter:
if: github.event_name != 'push'
name: SuperLinter 🦸‍♀️
Expand Down
32 changes: 32 additions & 0 deletions .github/workflows/scheduled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -32,9 +54,19 @@ jobs:
with:
issue-assignees: "shajoezhu,Melkiades,edelarua,ayogasekaram"
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:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ default_language_version:
python: python3
repos:
- repo: https://github.com/lorenzwalthert/precommit
rev: v0.4.3
rev: v0.4.3.9001
hooks:
- id: roxygenize
additional_dependencies:
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: rtables
Title: Reporting Tables
Version: 0.6.9.9013
Date: 2024-09-06
Version: 0.6.9.9015
Date: 2024-09-17
Authors@R: c(
person("Gabriel", "Becker", , "[email protected]", role = "aut",
comment = "Original creator of the package"),
Expand Down Expand Up @@ -29,7 +29,7 @@ URL: https://github.com/insightsengineering/rtables,
https://insightsengineering.github.io/rtables/
BugReports: https://github.com/insightsengineering/rtables/issues
Depends:
formatters (>= 0.5.8.9006),
formatters (>= 0.5.9),
magrittr (>= 1.5),
methods,
R (>= 2.10)
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## rtables 0.6.9.9013
## rtables 0.6.9.9015
### Features
* Modified `reorder_split_levels()` to cover more edge cases and be more stringent in the allowed inputs.
* Removed `tt` input from `theme_docx_default()` and added internal handling for row classes and number of columns.
Expand Down

0 comments on commit 342be6c

Please sign in to comment.