Skip to content

Commit

Permalink
Merge pull request #2397 from adamrtalbot/use_one_testing_workflow
Browse files Browse the repository at this point in the history
Remove fixed Ubuntu 20.04 testing workflow
  • Loading branch information
adamrtalbot authored Aug 15, 2023
2 parents 3ec2697 + 38f986f commit 9d63f93
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 54 deletions.
53 changes: 0 additions & 53 deletions .github/workflows/pytest-frozen-ubuntu-20.04.yml

This file was deleted.

17 changes: 16 additions & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,19 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
GITHUB_TOKEN: ${{ github.token }}

jobs:
pytest:
runs-on: ubuntu-latest
runs-on: ${{ matrix.runner }}
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
runner: ["ubuntu-latest"]
include:
- runner: "ubuntu-20.04"
python-version: "3.8"

steps:
- uses: actions/checkout@v3
Expand All @@ -35,6 +42,14 @@ jobs:
python -m pip install --upgrade pip -r requirements-dev.txt
pip install -e .
- name: Downgrade git to the Ubuntu official repository's version
if: ${{ matrix.runner == 'ubuntu-20.04' && matrix.python-version == '3.8' }}
run: |
sudo apt update
sudo apt remove git git-man
sudo add-apt-repository --remove ppa:git-core/ppa
sudo apt install git
- name: Install Nextflow
uses: nf-core/setup-nextflow@v1
with:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Add module MULTIQC to modules.config ([#2377](https://github.com/nf-core/tools/pull/2377))
- Update the Code of Conduct ([#2381](https://github.com/nf-core/tools/pull/2381))
- Save template information to `.nf-core.yml` and deprecate argument `--template-yaml` for `nf-core sync` ([#2388](https://github.com/nf-core/tools/pull/2388) and [#2389](https://github.com/nf-core/tools/pull/2389))
- Remove fixed Ubuntu test and added to standard testing matrix

### Download

Expand Down

0 comments on commit 9d63f93

Please sign in to comment.