diff --git a/.github/internal/install-shinyverse/action.yaml b/.github/internal/install-shinyverse/action.yaml index 03dddf2d2e..b7ca168c61 100644 --- a/.github/internal/install-shinyverse/action.yaml +++ b/.github/internal/install-shinyverse/action.yaml @@ -50,22 +50,27 @@ runs: extra-packages: ${{ inputs.extra-packages }} pak-version: "devel" - - name: Get packages for macOS system dependencies - if: runner.os == 'macOS' - id: mac-deps - shell: Rscript {0} - run: | - deps <- setdiff( - sort(unique(unlist(unname(shinycoreci:::apps_deps_map)))), - shinycoreci:::shinyverse_pkgs - ) - cat("Deps found:\n", paste0("* ", deps, collapse = "\n"), "\n", sep = "") + - uses: r-hub/actions/setup-r-sysreqs@v1 + with: + type: full + xquartz: true - out_deps <- paste0(deps, collapse = " ") - cat("pkgs=", out_deps, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE) + # - name: Get packages for macOS system dependencies + # if: runner.os == 'macOS' + # id: mac-deps + # shell: Rscript {0} + # run: | + # deps <- setdiff( + # sort(unique(unlist(unname(shinycoreci:::apps_deps_map)))), + # shinycoreci:::shinyverse_pkgs + # ) + # cat("Deps found:\n", paste0("* ", deps, collapse = "\n"), "\n", sep = "") - - name: Install mac system dependencies for app packages - if: runner.os == 'macOS' - uses: rstudio/shiny-workflows/setup-macOS-dependencies@v1 - with: - extra-packages: ${{ steps.mac-deps.outputs.pkgs }} Cairo FreeType RMySQL textshaping units + # out_deps <- paste0(deps, collapse = " ") + # cat("pkgs=", out_deps, "\n", file = Sys.getenv("GITHUB_OUTPUT"), sep = "", append = TRUE) + + # - name: Install mac system dependencies for app packages + # if: runner.os == 'macOS' + # uses: rstudio/shiny-workflows/setup-macOS-dependencies@v1 + # with: + # extra-packages: ${{ steps.mac-deps.outputs.pkgs }} Cairo FreeType RMySQL textshaping units diff --git a/.github/workflows/apps-config.yml b/.github/workflows/apps-config.yml index dfd5e24781..3d654f4aaf 100644 --- a/.github/workflows/apps-config.yml +++ b/.github/workflows/apps-config.yml @@ -16,7 +16,16 @@ on: value: "windows-latest" ubuntu: description: ubuntu OS value - value: "ubuntu-latest" + value: "ubuntu-24.04" + rspm-macos: + description: macOS RSPM + value: "https://p3m.dev/cran/latest" + rspm-windows: + description: windows RSPM + value: "https://p3m.dev/cran/latest" + rpspm-ubuntu: + description: ubuntu RSPM + value: "https://p3m.dev/cran/__linux__/noble/latest" cache-version: description: cache-version to be used when pulling library cache value: "13" diff --git a/.github/workflows/apps-test-matrix.yml b/.github/workflows/apps-test-matrix.yml index b3bec85ce0..9b4878ace1 100644 --- a/.github/workflows/apps-test-matrix.yml +++ b/.github/workflows/apps-test-matrix.yml @@ -32,6 +32,7 @@ jobs: r-version: ${{ needs.config.outputs.release }} os: ${{ needs.config.outputs.macos }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-macos }} macos-oldrel-1: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -39,6 +40,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel1 }} os: ${{ needs.config.outputs.macos }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-macos }} macos-oldrel-2: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -46,6 +48,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel2 }} os: ${{ needs.config.outputs.macos }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-macos }} macos-oldrel-3: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -53,15 +56,15 @@ jobs: r-version: ${{ needs.config.outputs.oldrel3 }} os: ${{ needs.config.outputs.macos }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-macos }} macos-oldrel-4: needs: [config] uses: ./.github/workflows/apps-test-os.yml with: r-version: ${{ needs.config.outputs.oldrel4 }} - os: macos-13 - # TODO-future: Use config below when the oldrel4 r-version is >= 4.1 - # os: ${{ needs.config.outputs.macos }} + os: ${{ needs.config.outputs.macos }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-macos }} ubuntu-release: needs: [config] @@ -70,6 +73,7 @@ jobs: r-version: ${{ needs.config.outputs.release }} os: ${{ needs.config.outputs.ubuntu }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-ubuntu }} ubuntu-oldrel-1: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -77,6 +81,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel1 }} os: ${{ needs.config.outputs.ubuntu }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-ubuntu }} ubuntu-oldrel-2: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -84,6 +89,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel2 }} os: ${{ needs.config.outputs.ubuntu }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-ubuntu }} ubuntu-oldrel-3: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -91,6 +97,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel3 }} os: ${{ needs.config.outputs.ubuntu }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-ubuntu }} ubuntu-oldrel-4: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -98,6 +105,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel4 }} os: ${{ needs.config.outputs.ubuntu }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-ubuntu }} windows-release: needs: [config] @@ -106,6 +114,7 @@ jobs: r-version: ${{ needs.config.outputs.release }} os: ${{ needs.config.outputs.windows }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-windows }} windows-oldrel-1: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -113,6 +122,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel1 }} os: ${{ needs.config.outputs.windows }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-windows }} windows-oldrel-2: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -120,6 +130,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel2 }} os: ${{ needs.config.outputs.windows }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-windows }} windows-oldrel-3: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -127,6 +138,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel3 }} os: ${{ needs.config.outputs.windows }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-windows }} windows-oldrel-4: needs: [config] uses: ./.github/workflows/apps-test-os.yml @@ -134,6 +146,7 @@ jobs: r-version: ${{ needs.config.outputs.oldrel4 }} os: ${{ needs.config.outputs.windows }} cache-version: ${{ needs.config.outputs.cache-version }} + rspm: ${{ needs.config.outputs.rspm-windows }} build-results: uses: ./.github/workflows/build-results.yml diff --git a/.github/workflows/apps-test-os.yml b/.github/workflows/apps-test-os.yml index 6a3a3d888c..feb6d220ab 100644 --- a/.github/workflows/apps-test-os.yml +++ b/.github/workflows/apps-test-os.yml @@ -7,7 +7,11 @@ on: required: false os: type: string - default: ubuntu-latest + default: ubuntu-24.04 + required: false + rspm: + type: string + default: "https://p3m.dev/cran/__linux__/noble/latest" required: false extra-key: type: string @@ -45,6 +49,7 @@ jobs: env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + RSPM: ${{ inputs.rspm }} steps: - name: Set up JDK 11 diff --git a/R/install.R b/R/install.R index 106e64504a..c955333ec1 100644 --- a/R/install.R +++ b/R/install.R @@ -17,9 +17,11 @@ shinycoreci_is_local <- function() { } shinyverse_repos_option <- function() { + RSPM <- Sys.getenv("RSPM") c( # Use the shinycoreci universe to avoid GH rate limits! "AAA" = shinyverse_cran_url, + if (nzchar(RSPM)) c("RSPM" = RSPM), getOption("repos", c("CRAN" = "https://cloud.r-project.org")) ) } diff --git a/inst/apps/109-render-table/DESCRIPTION b/inst/apps/109-render-table/DESCRIPTION index ae5244ca98..5315480e0f 100644 --- a/inst/apps/109-render-table/DESCRIPTION +++ b/inst/apps/109-render-table/DESCRIPTION @@ -4,4 +4,4 @@ Author: Bárbara Borges AuthorUrl: http://www.rstudio.com/ License: MIT DisplayMode: Normal -Tags: outputs \ No newline at end of file +Tags: outputs