Skip to content

Commit

Permalink
Use regular installation methods
Browse files Browse the repository at this point in the history
  • Loading branch information
cpsievert authored May 17, 2024
1 parent 0e47d2c commit 68d6f4c
Showing 1 changed file with 0 additions and 24 deletions.
24 changes: 0 additions & 24 deletions .github/internal/install-shinyverse/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -48,28 +40,12 @@ 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 }}
http-user-agent: ${{ inputs.http-user-agent }}
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"))

0 comments on commit 68d6f4c

Please sign in to comment.