From 75c45dbeea1ff8b7867d9ad116a950ca39655a3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daphn=C3=A9=20Grasselly?= <56442075+dgrassellyb@users.noreply.github.com> Date: Mon, 6 Nov 2023 12:37:11 +0100 Subject: [PATCH 1/2] Update common.yml --- .github/workflows/common.yml | 40 ++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index ca7b8612..c67df158 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -33,31 +33,48 @@ 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: "4.1" + 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: "4.1" + 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: "4.1" + 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: "4.1" + r-version: "${{ needs.get_r_version.outputs.r-version }}" check: name: Check uses: pharmaverse/admiralci/.github/workflows/r-cmd-check.yml@main @@ -68,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: "4.1" + 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 @@ -78,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: "4.1" + r-version: "${{ needs.get_r_version.outputs.r-version }}" links: name: Links uses: pharmaverse/admiralci/.github/workflows/links.yml@main @@ -90,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: "4.1" + 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 @@ -101,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: "4.1" + 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: "4.1" + r-version: "${{ needs.get_r_version.outputs.r-version }}" From 5a17b2f9ac030b2bb206fc2d15ccb33536d3354a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daphn=C3=A9=20Grasselly?= <56442075+dgrassellyb@users.noreply.github.com> Date: Mon, 6 Nov 2023 15:57:43 +0100 Subject: [PATCH 2/2] Delete .github/workflows/templates.yml --- .github/workflows/templates.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/templates.yml diff --git a/.github/workflows/templates.yml b/.github/workflows/templates.yml deleted file mode 100644 index 986745ad..00000000 --- a/.github/workflows/templates.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Check Templates - -on: - workflow_dispatch: - pull_request: - branches: - - main - - devel - -jobs: - templates: - name: Check Templates - uses: pharmaverse/admiralci/.github/workflows/check-templates.yml@main - secrets: inherit - with: - r-version: "4.1" - push-templates-data: true