Skip to content

Commit

Permalink
remove testing on macos-latest because there's no blast/igblast avail…
Browse files Browse the repository at this point in the history
…able (#380)

* remove testing on macos-latest because there's no blast/igblast available

* update action

* fix R

* try and fix r and bioc
  • Loading branch information
zktuong committed Apr 30, 2024
1 parent 69ed767 commit 48c1a02
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/tests.yml
Expand Up @@ -54,9 +54,9 @@ jobs:
- { python-version: 3.9, os: ubuntu-latest }
- { python-version: "3.10", os: ubuntu-latest }
- { python-version: "3.11", os: ubuntu-latest }
- { python-version: 3.9, os: macos-latest }
- { python-version: "3.10", os: macos-latest }
- { python-version: "3.11", os: macos-latest }
- { python-version: 3.9, os: macos-13 }
- { python-version: "3.10", os: macos-13 }
- { python-version: "3.11", os: macos-13 }
# disabled until it's fixed.
runs-on: ${{ matrix.config.os }}
env:
Expand All @@ -77,10 +77,15 @@ jobs:
sudo apt-get update -y && sudo apt-get install -y zlib1g-dev libglpk-dev libgmp3-dev libxml2-dev libicu-dev libhdf5-serial-dev libcurl4-gnutls-dev
- name: Install macOS system dependencies
if: matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-13'
run: |
brew install cairo pkg-config autoconf automake libtool
- name: Setup R and Bioconductor
uses: grimbough/bioc-actions/setup-bioc@v1
with:
bioc-version: release

- name: Cache conda
uses: actions/cache@v3
env:
Expand All @@ -92,7 +97,7 @@ jobs:
hashFiles('environment.yml') }}

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
auto-update-conda: true
Expand Down Expand Up @@ -133,11 +138,6 @@ jobs:
echo "biocversion=$(Rscript -e 'cat(as.character(tools:::.BioC_version_associated_with_R_version()))' | awk '{print $1}')" >> $GITHUB_OUTPUT
shell: bash -l {0}

- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ steps.R.outputs.version}}

- name: Cache ubuntu R packages
if: "!contains(github.event.head_commit.message, '/nocache') && matrix.config.os == 'ubuntu-latest'"
uses: actions/cache@v3
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/tests_weekly.yml
Expand Up @@ -30,9 +30,9 @@ jobs:
- { python-version: 3.9, os: ubuntu-latest }
- { python-version: "3.10", os: ubuntu-latest }
- { python-version: "3.11", os: ubuntu-latest }
- { python-version: 3.9, os: macos-latest }
- { python-version: "3.10", os: macos-latest }
- { python-version: "3.11", os: macos-latest }
- { python-version: 3.9, os: macos-13 }
- { python-version: "3.10", os: macos-13 }
- { python-version: "3.11", os: macos-13 }
# disabled until it's fixed.
runs-on: ${{ matrix.config.os }}
env:
Expand All @@ -53,10 +53,15 @@ jobs:
sudo apt-get update -y && sudo apt-get install -y zlib1g-dev libglpk-dev libgmp3-dev libxml2-dev libicu-dev libhdf5-serial-dev libcurl4-gnutls-dev
- name: Install macOS system dependencies
if: matrix.config.os == 'macos-latest'
if: matrix.config.os == 'macos-13'
run: |
brew install cairo pkg-config autoconf automake libtool
- name: Setup R and Bioconductor
uses: grimbough/bioc-actions/setup-bioc@v1
with:
bioc-version: release

- name: Cache conda
uses: actions/cache@v3
env:
Expand All @@ -68,7 +73,7 @@ jobs:
hashFiles('environment.yml') }}

- name: Setup Miniconda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-activate-base: true
auto-update-conda: true
Expand Down Expand Up @@ -109,11 +114,6 @@ jobs:
echo "biocversion=$(Rscript -e 'cat(as.character(tools:::.BioC_version_associated_with_R_version()))' | awk '{print $1}')" >> $GITHUB_OUTPUT
shell: bash -l {0}

- name: Set up R
uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ steps.R.outputs.version}}

- name: Cache ubuntu R packages
if: "!contains(github.event.head_commit.message, '/nocache') && matrix.config.os == 'ubuntu-latest'"
uses: actions/cache@v3
Expand Down

0 comments on commit 48c1a02

Please sign in to comment.