Skip to content

Commit

Permalink
Merge branch 'main' into 1212_update_legend@main
Browse files Browse the repository at this point in the history
  • Loading branch information
edelarua committed Apr 15, 2024
2 parents 56f9ac6 + fce3ed2 commit 9e92526
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 15 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,31 @@ jobs:
checking top-level files .* NOTE
unit-test-report-brand: >-
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/tern.png
r-cmd-non-cran:
name: R CMD Check (non-CRAN) 🧬
uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
with:
additional-env-vars: |
_R_CHECK_CRAN_INCOMING_REMOTE_=false
enforce-note-blocklist: true
publish-unit-test-report-gh-pages: false
junit-xml-comparison: false
concurrency-group: non-cran
disable-unit-test-reports: true
skip-r-cmd-install: true
note-blocklist: |
checking dependencies in R code .* NOTE
checking R code for possible problems .* NOTE
checking examples .* NOTE
checking Rd line widths .* NOTE
checking S3 generic/method consistency .* NOTE
checking Rd .usage sections .* NOTE
checking for unstated dependencies in vignettes .* NOTE
checking top-level files .* NOTE
unit-test-report-brand: >-
https://raw.githubusercontent.com/insightsengineering/hex-stickers/main/thumbs/tern.png
coverage:
name: Coverage 📔
uses: insightsengineering/r.pkg.template/.github/workflows/test-coverage.yaml@main
Expand Down Expand Up @@ -86,6 +111,8 @@ jobs:
uses: insightsengineering/r.pkg.template/.github/workflows/style.yaml@main
with:
auto-update: true
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
grammar:
if: github.event_name != 'push'
name: Grammar Check 🔤
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/cla.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: CLA 🔏

on:
issue_comment:
types:
- created
# For PRs that originate from forks
pull_request_target:
types:
- opened
- closed
- synchronize

jobs:
CLA:
name: CLA 📝
uses: insightsengineering/.github/.github/workflows/cla.yaml@main
secrets: inherit
13 changes: 2 additions & 11 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ on:
workflow_dispatch:

jobs:
build:
name: Build package 🎁
needs: release
uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
with:
skip-r-cmd-check: true
skip-r-cmd-install: true
docs:
name: Pkgdown Docs 📚
needs: release
Expand All @@ -36,8 +27,8 @@ jobs:
uses: insightsengineering/r.pkg.template/.github/workflows/release.yaml@main
secrets:
REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }}
r-cmd:
name: R CMD Check 🧬
build:
name: Build package and reports 🎁
needs: [release, docs]
uses: insightsengineering/r.pkg.template/.github/workflows/build-check-install.yaml@main
secrets:
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.1
rev: v0.4.2
hooks:
- id: style-files
name: Style code with `styler`
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: tern
Title: Create Common TLGs Used in Clinical Trials
Version: 0.9.3.9032
Date: 2024-04-12
Version: 0.9.3.9033
Date: 2024-04-15
Authors@R: c(
person("Joe", "Zhu", , "joe.zhu@roche.com", role = c("aut", "cre")),
person("Daniel", "Sabanés Bové", , "daniel.sabanes_bove@roche.com", role = "aut"),
Expand Down
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# tern 0.9.3.9032
# tern 0.9.3.9033

### New Features
* Refactored `g_forest` to output a `ggplot` object instead of a `grob` object.
Expand Down

0 comments on commit 9e92526

Please sign in to comment.