diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 628e5ab..f1a347a 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -15,14 +15,12 @@ on: - "v*" branches: - main - - devel - patch # 'pull_request' events are triggered when PRs are # created against one of these target branches. pull_request: branches: - main - - devel - patch # 'release' events are triggered when... # you guessed it - when releases are made. @@ -36,8 +34,8 @@ concurrency: cancel-in-progress: true env: - R_VERSION: "4.1" - + R_VERSION: "release" + jobs: get_r_version: name: Get R version @@ -80,6 +78,8 @@ jobs: check: name: Check uses: pharmaverse/admiralci/.github/workflows/r-cmd-check.yml@main + with: + error-on: warning # TODO: find a way to ignore specific notes if: github.event_name == 'pull_request' docs: name: Documentation @@ -87,20 +87,15 @@ jobs: if: github.event_name == 'push' || startsWith(github.ref, 'refs/tags/v') needs: get_r_version with: - 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 - skip-multiversion-docs: false - latest-tag-alt-name: cran-release - multiversion-docs-landing-page: cran-release - branches-or-tags-to-list: >- - ^cran-release$|^main$|^v([0-9]+\\.)?([0-9]+\\.)?([0-9]+)$ + r-version: "release" + skip-multiversion-docs: true + secrets: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} linter: name: Lint uses: pharmaverse/admiralci/.github/workflows/lintr.yml@main - if: github.event_name == 'pull_request' needs: get_r_version + if: github.event_name == 'pull_request' with: r-version: "${{ needs.get_r_version.outputs.r-version }}" links: @@ -130,8 +125,13 @@ jobs: name: Check Templates uses: pharmaverse/admiralci/.github/workflows/check-templates.yml@main secrets: inherit - if: github.event.review.state == 'approved' + if: github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' needs: get_r_version with: r-version: "${{ needs.get_r_version.outputs.r-version }}" - push-templates-data: true + vbump: + name: Version Bump 🤜🤛 + if: github.event_name == 'push' + uses: insightsengineering/r.pkg.template/.github/workflows/version-bump.yaml@main + secrets: + REPO_GITHUB_TOKEN: ${{ secrets.PHARMAVERSE_BOT }}