Skip to content

Commit dcd51d1

Browse files
committed
try removing workarounds
1 parent 91d01b9 commit dcd51d1

1 file changed

Lines changed: 2 additions & 36 deletions

File tree

.github/workflows/R-CMD-check-bioc.yaml

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -48,55 +48,21 @@ jobs:
4848
sudo apt-get update
4949
sudo apt-get -y install hdf5-tools libsz2 libaec-dev
5050
51-
## Workaround:
52-
## * data.table (indirect dep via Seurat) fails to compile on macOS ARM because libintl.h is missing.
53-
## * rhdf5 also fails to link because libssl/libcrypto are not on the default library search path.
51+
## Install missing libraries for macOS ARM (macOS-latest)
5452
- name: Install macOS dependencies
55-
if: runner.os == 'macOS'
53+
if: matrix.config.os == 'macOS-latest'
5654
run: |
5755
brew install gettext openssl
5856
mkdir -p ~/.R
5957
echo "CPPFLAGS += -I$(brew --prefix gettext)/include -I$(brew --prefix openssl)/include" >> ~/.R/Makevars
6058
echo "LDFLAGS += -L$(brew --prefix gettext)/lib -L$(brew --prefix openssl)/lib" >> ~/.R/Makevars
6159
6260
- name: Setup R and Bioconductor
63-
# todo: remove this workaround line once it is working for windows and/or mac os x
64-
if: matrix.config.os != 'windows-latest' && matrix.config.os != 'macOS-latest'
65-
# uses: grimbough/bioc-actions/setup-bioc@v1
6661
uses: rcannood/bioc-actions/setup-bioc@remove-version-map
6762
with:
6863
bioc-version: ${{ matrix.config.bioc-version }}
6964
bioc-mirror: ${{ matrix.config.bioc-mirror }}
7065

71-
## windows-latest and macOS-latest (ARM) hit a bug in R-devel (commit
72-
## dd03406, 2026-04-09) where BiocManager::install() crashes via
73-
## old.packages(type="both") -> .available.both() -> subscript out of
74-
## bounds. Work around by setting up R manually and calling
75-
## BiocManager::install(update=FALSE) to skip the old.packages() call.
76-
- name: Setup R (Windows/macOS-ARM devel)
77-
if: matrix.config.os == 'windows-latest' || matrix.config.os == 'macOS-latest'
78-
uses: r-lib/actions/setup-r@v2
79-
with:
80-
r-version: devel
81-
rtools-version: 45
82-
use-public-rspm: true
83-
84-
- name: Setup Bioconductor (Windows/macOS-ARM devel)
85-
if: matrix.config.os == 'windows-latest' || matrix.config.os == 'macOS-latest'
86-
shell: Rscript {0}
87-
run: |
88-
download.file(
89-
'https://bioconductor.org/checkResults/devel/bioc-LATEST/Renviron.bioc',
90-
destfile = '~/.Renviron', mode = 'wb')
91-
write(
92-
'options(BioC_mirror = "${{ matrix.config.bioc-mirror }}")',
93-
file = '~/.Rprofile', append = TRUE)
94-
install.packages(c("BiocManager", "remotes"), quiet = TRUE)
95-
## update=FALSE avoids calling old.packages(type="both") which
96-
## triggers the R-devel bug in .available.both() (commit dd03406)
97-
BiocManager::install(version = "3.23", ask = FALSE, update = FALSE)
98-
cat("R_BIOC_VERSION=3.23\n", file = Sys.getenv("GITHUB_ENV"), append = TRUE)
99-
10066
- name: Install pandoc
10167
uses: r-lib/actions/setup-pandoc@v2
10268

0 commit comments

Comments
 (0)