Skip to content

Commit

Permalink
Merge branch 'main' into 225_navbar_update_and_description
Browse files Browse the repository at this point in the history
  • Loading branch information
ahasoplakus authored Dec 21, 2023
2 parents f398584 + 5dbbda1 commit 0256e27
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 14 deletions.
44 changes: 31 additions & 13 deletions .github/workflows/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,54 @@ on:
release:
types: [published]

env:
# R version to use for the workflows
R_VERSION: "3.6"

# Docs on concurrency:
# https://docs.github.com/en/actions/using-jobs/using-concurrency
concurrency:
group: admiral-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
R_VERSION: "4.1"

jobs:
get_r_version:
name: Get R version
runs-on: ubuntu-latest
outputs:
r-version: ${{ steps.get_r_version.outputs.R_VERSION }}
steps:
- name: Get R Version for Downstream Container Jobs
id: get_r_version
run: echo "R_VERSION=$R_VERSION" >> $GITHUB_OUTPUT
shell: bash
style:
name: Code Style
uses: pharmaverse/admiralci/.github/workflows/style.yml@main
if: github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
spellcheck:
name: Spelling
uses: pharmaverse/admiralci/.github/workflows/spellcheck.yml@main
if: github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
readme:
name: Render README
uses: pharmaverse/admiralci/.github/workflows/readme-render.yml@main
if: github.event_name == 'push'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
validation:
name: Validation
uses: pharmaverse/admiralci/.github/workflows/r-pkg-validation.yml@main
if: github.event_name == 'release'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
check:
name: Check
uses: pharmaverse/admiralci/.github/workflows/r-cmd-check.yml@main
Expand All @@ -72,8 +85,9 @@ jobs:
name: Documentation
uses: pharmaverse/admiralci/.github/workflows/pkgdown.yml@main
if: github.event_name == 'push'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
# Whether to skip multiversion docs
# Note that if you have multiple versions of docs,
# your URL links are likely to break due to path changes
Expand All @@ -82,8 +96,9 @@ jobs:
name: Lint
uses: pharmaverse/admiralci/.github/workflows/lintr.yml@main
if: github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
links:
name: Links
uses: pharmaverse/admiralci/.github/workflows/links.yml@main
Expand All @@ -94,8 +109,9 @@ jobs:
uses: pharmaverse/admiralci/.github/workflows/code-coverage.yml@main
if: >
github.event_name == 'push' || github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
# Whether to skip code coverage badge creation
# Setting to 'false' will require you to create
# an orphan branch called 'badges' in your repository
Expand All @@ -105,11 +121,13 @@ jobs:
uses: pharmaverse/admiralci/.github/workflows/check-templates.yml@main
if: >
github.event_name == 'push' || github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
man-pages:
name: Man Pages
uses: pharmaverse/admiralci/.github/workflows/man-pages.yml@main
if: github.event_name == 'pull_request'
needs: get_r_version
with:
r-version: $R_VERSION
r-version: "${{ needs.get_r_version.outputs.r-version }}"
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ version of {admiralvaccine} was released.

## References and Documentation

* Please refer to the [{admiral} References and Documentation](https://pharmaverse.github.io/admiral/main/)
* Please refer to the [{admiral} References and Documentation](https://pharmaverse.github.io/admiral/)

## R Versions

Expand Down

0 comments on commit 0256e27

Please sign in to comment.