diff --git a/.github/workflows/bioccheck.yaml b/.github/workflows/bioccheck.yaml index dcccb144..7e29d98d 100644 --- a/.github/workflows/bioccheck.yaml +++ b/.github/workflows/bioccheck.yaml @@ -61,12 +61,6 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - List of package references to be used by setup-r-dependencies action if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" concurrency: group: bioccheck-${{ github.event.pull_request.number || github.ref }} @@ -158,12 +152,11 @@ jobs: - name: Setup R dependencies 🎦 if: >- inputs.deps-installation-method == 'setup-r-dependencies' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + working-directory: ${{ 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 72e649b0..b201c90d 100644 --- a/.github/workflows/build-check-install.yaml +++ b/.github/workflows/build-check-install.yaml @@ -139,40 +139,13 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - List of package references to be used by setup-r-dependencies action if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" - skip-desc-branch: - description: | - Passed to `insightsengineering/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/setup-r-dependencies`. - Used only if deps-installation-method == 'setup-r-dependencies'. - required: false - type: boolean - default: false - repository-list: - description: | - Passed to `insightsengineering/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/setup-r-dependencies`. + Passed to `r-lib/actions/setup-r-dependencies`. Used only if deps-installation-method == 'setup-r-dependencies'. required: false type: string - default: "1" + 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 @@ -442,15 +415,11 @@ jobs: if: >- env.deps_installation_method == 'setup-r-dependencies' && inputs.install-deps-from-package-repositories == '' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - 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 }} + working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} cache-version: ${{ inputs.cache-version }} - name: Install dependencies from package repositories 🗄️ diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 0547e448..f989c13f 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -128,12 +128,6 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - List of package references to be used by setup-r-dependencies action if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" concurrency: group: docs-${{ github.event.pull_request.number || github.ref }} @@ -230,12 +224,11 @@ jobs: - name: Setup R dependencies 🎦 if: >- inputs.deps-installation-method == 'setup-r-dependencies' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} needs: "website" - name: Install R package 🚧 diff --git a/.github/workflows/revdepcheck.yaml b/.github/workflows/revdepcheck.yaml index ce163f51..c31b5706 100644 --- a/.github/workflows/revdepcheck.yaml +++ b/.github/workflows/revdepcheck.yaml @@ -91,12 +91,9 @@ jobs: shell: bash - name: Install dependencies - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} - with: - lookup-refs: ${{ inputs.lookup-refs }} - skip-desc-branch: true - name: revdepcheck 🔄 id: revdepcheck diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml index 4a1240d6..52789e44 100644 --- a/.github/workflows/rhub.yaml +++ b/.github/workflows/rhub.yaml @@ -40,13 +40,6 @@ on: gcc13, noSuggests, donttest - lookup-refs: - description: | - List of package references to be used for the feature branch. - Multiple entries in new lines or separated by commas. - required: false - default: "" - type: string concurrency: group: r-hub-${{ github.event.pull_request.number || github.ref }} @@ -96,13 +89,10 @@ jobs: with: job-config: ${{ matrix.config.job-config }} - - uses: insightsengineering/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - skip-install: true - restore-description: false install-quarto: "false" - uses: r-hub/actions/setup-deps@v1 @@ -149,13 +139,10 @@ jobs: with: job-config: ${{ matrix.config.job-config }} - - uses: insightsengineering/setup-r-dependencies@v1 + - uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - skip-install: true - restore-description: false install-quarto: "false" - uses: r-hub/actions/setup-deps@v1 diff --git a/.github/workflows/roxygen.yaml b/.github/workflows/roxygen.yaml index 73562c59..725a5a84 100644 --- a/.github/workflows/roxygen.yaml +++ b/.github/workflows/roxygen.yaml @@ -49,13 +49,6 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - Passed to insightsengineering/setup-r-dependencies. See its documentation. - Used only if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" secrets: REPO_GITHUB_TOKEN: description: | @@ -152,12 +145,11 @@ jobs: - name: Setup R dependencies 🎦 if: >- env.deps_installation_method == 'setup-r-dependencies' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + working-directory: ${{ 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 eaf6e138..9d430db7 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -90,12 +90,6 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - List of package references to be used by setup-r-dependencies action if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" secrets: REPO_GITHUB_TOKEN: description: | @@ -243,12 +237,11 @@ jobs: - name: Setup R dependencies 🎦 if: >- inputs.deps-installation-method == 'setup-r-dependencies' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - repository-path: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} + working-directory: ${{ github.event.repository.name }}/${{ inputs.package-subdirectory }} - name: Install R package 🚧 run: | diff --git a/.github/workflows/validation.yaml b/.github/workflows/validation.yaml index 961d4e39..08a0e8ce 100644 --- a/.github/workflows/validation.yaml +++ b/.github/workflows/validation.yaml @@ -46,12 +46,6 @@ on: required: false type: string default: staged-dependencies - lookup-refs: - description: | - List of package references to be used by setup-r-dependencies action if deps-installation-method == 'setup-r-dependencies'. - required: false - type: string - default: "" secrets: REPO_GITHUB_TOKEN: description: | @@ -147,12 +141,11 @@ jobs: - name: Setup R dependencies 🎦 if: >- inputs.deps-installation-method == 'setup-r-dependencies' - uses: insightsengineering/setup-r-dependencies@v1 + uses: r-lib/actions/setup-r-dependencies@v2 env: GITHUB_PAT: ${{ steps.github-token.outputs.token }} with: - lookup-refs: ${{ inputs.lookup-refs }} - repository-path: ${{ env.package_subdirectory }} + working-directory: ${{ env.package_subdirectory }} - name: Build report 🏗 uses: insightsengineering/thevalidatoR@v2