From 68d6f4c5bca18ad2fd476fa2f5f85e5df219eafd Mon Sep 17 00:00:00 2001 From: Carson Sievert Date: Fri, 17 May 2024 14:38:42 -0500 Subject: [PATCH] Use regular installation methods --- .../internal/install-shinyverse/action.yaml | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/.github/internal/install-shinyverse/action.yaml b/.github/internal/install-shinyverse/action.yaml index af490200fe..71957fb4d0 100644 --- a/.github/internal/install-shinyverse/action.yaml +++ b/.github/internal/install-shinyverse/action.yaml @@ -22,14 +22,6 @@ inputs: description: Pandoc version to pass through default: "3.x" required: false - packagemanager-cran-url: - description: packagemanager url to be used for CRAN installations - default: "https://packagemanager.posit.co/cran/latest" - required: false - cran-url: - description: CRAN url to be used for CRAN installations - default: "https://cran.rstudio.com" - required: false runs: using: "composite" steps: @@ -48,16 +40,8 @@ runs: sudo apt-get update sudo apt-get install -y libglpk-dev - # We need to have the first repo to be `shinyverse` repo, then RSPM, then cran-url - # Recreate logic from https://github.com/r-lib/actions/blob/413b6a4ba22b7bcaa726df1c8f88dcd574fbc8c4/setup-r/src/installer.ts#L598-L670 - # * Do not set RSPM input (use-public-rspm: false) to make `CRAN` repo the first repo - # * Set CRAN env so that `packagemanger` repo is first - # * Add backup of `cran-url` in `extra-repositories` - # * Do not set RSPM envvar pointing to `packagemanager-cran-url` as it will make `RSPM` repo the first repo - name: Install R and shinycoreci uses: rstudio/shiny-workflows/setup-r-package@v1 - env: - CRAN: ${{ inputs.packagemanager-cran-url }} with: r-version: ${{ inputs.r-version }} cache-version: ${{ inputs.cache-version }} @@ -65,11 +49,3 @@ runs: pandoc-version: ${{ inputs.pandoc-version }} extra-packages: ${{ inputs.extra-packages }} - use-public-rspm: false - extra-repositories: | - ${{ inputs.cran-url }} - - - name: Show repos - shell: Rscript {0} - run: | - print(getOption("repos"))