From a237dcc3184c96a3eaac1476b11c79fc612d5140 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 31 Oct 2024 15:58:25 +0100 Subject: [PATCH 1/5] build-check-install - extend params for setup-r-depenencies --- .github/workflows/build-check-install.yaml | 34 +++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index 035e3b64..b3541315 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@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 @@ -408,11 +436,15 @@ jobs: if: >- env.deps_installation_method == 'setup-r-dependencies' && inputs.install-deps-from-package-repositories == '' - uses: insightsengineering/setup-r-dependencies@v1 + uses: insightsengineering/setup-r-dependencies@new_param_cache_version #@TODO: revert with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} repository-path: ${{ github.event.repository.name }} + 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 != '' From ca4cdaa93ee3e1baa3b608fe16a80e7a237650e1 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Thu, 31 Oct 2024 16:16:45 +0100 Subject: [PATCH 2/5] fix: include `package-subdirectory` in the setup-r-dependencies --- .github/workflows/bioccheck.yaml | 2 +- .github/workflows/build-check-install.yaml | 2 +- .github/workflows/pkgdown.yaml | 2 +- .github/workflows/roxygen.yaml | 2 +- .github/workflows/test-coverage.yaml | 2 +- 5 files changed, 5 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 b3541315..c1c36113 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -440,7 +440,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 }} skip-desc-branch: ${{ inputs.skip-desc-branch }} skip-desc-dev: ${{ inputs.skip-desc-dev }} repository-list: ${{ inputs.repository-list }} 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: | From 2d0ce037449681d81a40d8953189cada75878465 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Fri, 1 Nov 2024 12:39:06 +0100 Subject: [PATCH 3/5] update --- .github/workflows/build-check-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index c1c36113..9263a4b5 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -436,7 +436,7 @@ jobs: if: >- env.deps_installation_method == 'setup-r-dependencies' && inputs.install-deps-from-package-repositories == '' - uses: insightsengineering/setup-r-dependencies@new_param_cache_version #@TODO: revert + uses: insightsengineering/setup-r-dependencies@named_repos with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }} From 8a2021b7e870a4894772d17a204669015afef423 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 4 Nov 2024 11:53:05 +0100 Subject: [PATCH 4/5] add name --- .github/workflows/build-check-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index 9263a4b5..434e6f7d 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -164,7 +164,7 @@ on: Used only if deps-installation-method == 'setup-r-dependencies'. required: false type: string - default: "PPM@latest" + default: "PPM=PPM@latest" cache-version: description: | Passed to `insightsengineering/actions/setup-r-dependencies`. From 9aa3ff7d7f797dec2fa7cce67e9b66d504fd2644 Mon Sep 17 00:00:00 2001 From: Pawel Rucki <12943682+pawelru@users.noreply.github.com> Date: Mon, 4 Nov 2024 14:25:29 +0100 Subject: [PATCH 5/5] Update .github/workflows/build-check-install.yaml Signed-off-by: Pawel Rucki <12943682+pawelru@users.noreply.github.com> --- .github/workflows/build-check-install.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-check-install.yaml b/.github/workflows/build-check-install.yaml index 434e6f7d..40aafa92 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -436,7 +436,7 @@ jobs: if: >- env.deps_installation_method == 'setup-r-dependencies' && inputs.install-deps-from-package-repositories == '' - uses: insightsengineering/setup-r-dependencies@named_repos + uses: insightsengineering/setup-r-dependencies@v1 with: lookup-refs: ${{ inputs.lookup-refs }} github-token: ${{ steps.github-token.outputs.token }}