From 3829163766fe3579c7129c46b511482e9194dcef 2021-10-12 16:19:47 From: Matthias Bussonnier Date: 2021-10-12 16:19:47 Subject: [PATCH] Backport PR #13182: ci: Simplify CI maintenance by combining Ubuntu and macOS workflows --- diff --git a/.github/workflows/test-osx.yml b/.github/workflows/test-osx.yml deleted file mode 100644 index c9afbe0..0000000 --- a/.github/workflows/test-osx.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Run tests on OSX - -on: [push, pull_request] - -jobs: - test: - runs-on: macos-latest - - steps: - - uses: actions/checkout@v2 - - name: Set up Python 3.7 - uses: actions/setup-python@v2 - with: - python-version: 3.7 - - name: Install and update Python dependencies - run: | - python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade -e file://$PWD#egg=ipython[test] - python -m pip install --upgrade --upgrade-strategy eager trio curio - python -m pip install --upgrade pytest pytest-trio 'matplotlib!=3.2.0' - python -m pip install --upgrade anyio - - name: pytest - run: pytest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b9bbae4..2788e86 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,13 +1,27 @@ name: Run tests -on: [push, pull_request] +on: + push: + pull_request: + # Run weekly on Monday at 1:23 UTC + schedule: + - cron: '23 1 * * 1' + workflow_dispatch: + jobs: test: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} strategy: matrix: - python-version: [3.7, 3.8, 3.9] + os: [ubuntu-latest] + python-version: ["3.7", "3.8", "3.9"] + # Test all on ubuntu, test ends on macos + include: + - os: macos-latest + python-version: "3.7" + - os: macos-latest + python-version: "3.9" steps: - uses: actions/checkout@v2