From 74a1b071049972ab2b93571c93b5e7cec6cea0b1 Mon Sep 17 00:00:00 2001 From: Paul Hoffman Date: Fri, 8 Nov 2024 12:02:44 -0500 Subject: [PATCH] [r/ci] Remove tiledb-r specific install Remove specific installation steps for tiledb-r as the doublepin was removed in #3006 resolves #3314 [SC-59087](https://app.shortcut.com/tiledb-inc/story/59087) --- .github/workflows/pkgdown.yaml | 17 ----------------- .github/workflows/r-ci.yml | 17 ----------------- .github/workflows/r-python-interop-testing.yml | 13 ------------- .github/workflows/r-valgrind.yaml | 12 ------------ 4 files changed, 59 deletions(-) diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index bf045172b4..c9dfd1c6d5 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -31,23 +31,6 @@ jobs: with: use-public-rspm: true - - name: Set additional repositories (macOS) - if: ${{ matrix.os != 'ubuntu-latest' }} - run: echo 'options(repos = c("https://tiledb-inc.r-universe.dev", getOption("repos")), timeout = 300L)' | tee -a ~/.Rprofile - - - name: Set additional repositories (Linux) - if: ${{ matrix.os == 'ubuntu-latest' }} - run: | - rversion <- paste(strsplit(as.character(getRversion()), split = '\\.')[[1L]][1:2], collapse = '.') - codename <- system('. /etc/os-release; echo ${VERSION_CODENAME}', intern = TRUE) - repo <- "https://tiledb-inc.r-universe.dev" - (opt <- sprintf('options(repos = c("%s/bin/linux/%s/%s", "%s", getOption("repos")), timeout = 300L)', repo, codename, rversion, repo)) - cat(opt, "\n", file = "~/.Rprofile", append = TRUE) - shell: Rscript {0} - - - name: Install tiledb-r - run: cd apis/r && Rscript tools/install-tiledb-r.R - # Run this daily to surface errors as tracked at # https://github.com/single-cell-data/TileDB-SOMA/issues/2052 - name: Install dependencies diff --git a/.github/workflows/r-ci.yml b/.github/workflows/r-ci.yml index 7c75fa2507..1d9c3e7e33 100644 --- a/.github/workflows/r-ci.yml +++ b/.github/workflows/r-ci.yml @@ -60,23 +60,6 @@ jobs: - name: Bootstrap run: cd apis/r && tools/r-ci.sh bootstrap - - name: Set additional repositories (macOS) - if: ${{ matrix.os != 'ubuntu-latest' }} - run: echo 'options(repos = c("https://tiledb-inc.r-universe.dev", getOption("repos")), timeout = 300L)' | tee -a ~/.Rprofile - - - name: Set additional repositories (Linux) - if: ${{ matrix.os == 'ubuntu-latest' }} - run: | - rversion <- paste(strsplit(as.character(getRversion()), split = '\\.')[[1L]][1:2], collapse = '.') - codename <- system('. /etc/os-release; echo ${VERSION_CODENAME}', intern = TRUE) - repo <- "https://tiledb-inc.r-universe.dev" - (opt <- sprintf('options(repos = c("%s/bin/linux/%s/%s", "%s", getOption("repos")), timeout = 300L)', repo, codename, rversion, repo)) - cat(opt, "\n", file = "~/.Rprofile", append = TRUE) - shell: Rscript {0} - - - name: Install tiledb-r - run: cd apis/r && Rscript tools/install-tiledb-r.R - - name: Install BioConductor package SingleCellExperiment run: cd apis/r && tools/r-ci.sh install_bioc SingleCellExperiment diff --git a/.github/workflows/r-python-interop-testing.yml b/.github/workflows/r-python-interop-testing.yml index 079ee15331..0ae38b5c57 100644 --- a/.github/workflows/r-python-interop-testing.yml +++ b/.github/workflows/r-python-interop-testing.yml @@ -32,19 +32,6 @@ jobs: - name: Bootstrap run: cd apis/r && tools/r-ci.sh bootstrap - - name: Set additional repositories (Linux) - if: ${{ matrix.os == 'ubuntu-latest' }} - run: | - rversion <- paste(strsplit(as.character(getRversion()), split = '\\.')[[1L]][1:2], collapse = '.') - codename <- system('. /etc/os-release; echo ${VERSION_CODENAME}', intern = TRUE) - repo <- "https://tiledb-inc.r-universe.dev" - (opt <- sprintf('options(repos = c("%s/bin/linux/%s/%s", "%s", getOption("repos")))', repo, codename, rversion, repo)) - cat(opt, "\n", file = "~/.Rprofile", append = TRUE) - shell: Rscript {0} - - - name: Install tiledb-r - run: cd apis/r && Rscript tools/install-tiledb-r.R - - name: Dependencies run: cd apis/r && Rscript -e "remotes::install_deps(dependencies = TRUE, upgrade = FALSE)" diff --git a/.github/workflows/r-valgrind.yaml b/.github/workflows/r-valgrind.yaml index 6a84c0d235..83647109a6 100644 --- a/.github/workflows/r-valgrind.yaml +++ b/.github/workflows/r-valgrind.yaml @@ -25,18 +25,6 @@ jobs: - name: System Dependencies run: apt update -qq && apt upgrade --yes && apt install --yes --no-install-recommends valgrind cmake git - - name: Set additional repositories (Linux) - run: | - rversion <- paste(strsplit(as.character(getRversion()), split = '\\.')[[1L]][1:2], collapse = '.') - codename <- system('. /etc/os-release; echo ${VERSION_CODENAME}', intern = TRUE) - repo <- "https://tiledb-inc.r-universe.dev" - (opt <- sprintf('options(repos = c("%s/bin/linux/%s/%s", "%s", getOption("repos")), timeout = 300L)', repo, codename, rversion, repo)) - cat(opt, "\n", file = "~/.Rprofile", append = TRUE) - shell: Rscript {0} - - - name: Install tiledb-r - run: cd apis/r && Rscript tools/install-tiledb-r.R - - name: Package Dependencies run: cd apis/r && R -q -e 'remotes::install_deps(".", dependencies=TRUE, upgrade=FALSE)'