From 761d4403747ae9c206a90a9610d6ff81268a1b24 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:33:53 +0100 Subject: [PATCH] build-check-install - extend params for setup-r-depenencies (#260) Extend parameters to support custom logic in TLG-Catalog --------- Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/bioccheck.yaml | 2 +- .github/workflows/build-check-install.yaml | 34 +++++++++++++++++++++- .github/workflows/pkgdown.yaml | 2 +- .github/workflows/roxygen.yaml | 2 +- .github/workflows/test-coverage.yaml | 2 +- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/.github/workflows/bioccheck.yaml b/.github/workflows/bioccheck.yaml index 345226c0..0a59282a 100644 --- a/.github/workflows/bioccheck.yaml +++ b/.github/workflows/bioccheck.yaml @@ -162,7 +162,7 @@ jobs: with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} - repository-path: ${{ github.event.repository.name }} + repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} - name: Run BiocCheck ☣️ uses: insightsengineering/bioc-check-action@v1 diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index 035e3b64..40aafa92 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -144,6 +144,34 @@ on: required: false type: string default: "" + skip-desc-branch: + description: | + Passed to `insightsengineering/actions/setup-r-dependencies`. + Used only if deps-installation-method == 'setup-r-dependencies'. + required: false + type: boolean + default: false + skip-desc-dev: + description: | + Passed to `insightsengineering/actions/setup-r-dependencies`. + Used only if deps-installation-method == 'setup-r-dependencies'. + required: false + type: boolean + default: false + repository-list: + description: | + Passed to `insightsengineering/actions/setup-r-dependencies`. + Used only if deps-installation-method == 'setup-r-dependencies'. + required: false + type: string + default: "PPM=PPM@latest" + cache-version: + description: | + Passed to `insightsengineering/actions/setup-r-dependencies`. + Used only if deps-installation-method == 'setup-r-dependencies'. + required: true + type: string + default: "1" unit-test-report-brand: description: Image URL to use in unit test report for branding. If empty, the default xunit-viewer brand will be used. required: false @@ -412,7 +440,11 @@ jobs: with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} - repository-path: ${{ github.event.repository.name }} + repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + skip-desc-branch: ${{ inputs.skip-desc-branch }} + skip-desc-dev: ${{ inputs.skip-desc-dev }} + repository-list: ${{ inputs.repository-list }} + cache-version: ${{ inputs.cache-version }} - name: Install dependencies from package repositories 🗄️ if: inputs.install-deps-from-package-repositories != '' diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 4a0e2104..63952abb 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -234,7 +234,7 @@ jobs: with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} - repository-path: ${{ github.event.repository.name }} + repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} - name: Install R package 🚧 run: | diff --git a/.github/workflows/roxygen.yaml b/.github/workflows/roxygen.yaml index f8295f09..56e22f8e 100644 --- a/.github/workflows/roxygen.yaml +++ b/.github/workflows/roxygen.yaml @@ -156,7 +156,7 @@ jobs: with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} - repository-path: ${{ github.event.repository.name }} + repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} - name: Generate man pages 📄 run: | diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 8406b052..24058269 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -247,7 +247,7 @@ jobs: with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} - repository-path: ${{ github.event.repository.name }} + repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} - name: Install R package 🚧 run: |