diff --git a/.github/workflows/merge.yaml b/.github/workflows/merge.yaml index 816dcc726..0b8b7c9c0 100644 --- a/.github/workflows/merge.yaml +++ b/.github/workflows/merge.yaml @@ -53,20 +53,14 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-20.04, windows-latest] numpy: [1.20.3] python: [3.8.10, 3.7.9] # Patch version must be specified to avoid any cache confusion, since the cache key depends on the full Python version. If left unspecified, different patch versions could be allocated between jobs, and any such difference would lead to a cache not found error. - include: - - os: ubuntu-20.04 - activate_command: source venv/bin/activate - - os: windows-latest - activate_command: .\venv\Scripts\activate uses: ./.github/workflows/_lint.yaml with: - os: ${{ matrix.os }} + os: ubuntu-20.04 numpy: ${{ matrix.numpy }} python: ${{ matrix.python }} - activate_command: ${{ matrix.activate_command }} + activate_command: source venv/bin/activate # The idea behind these dependencies is we want to give feedback to # contributors on the version number only after they have passed all tests, diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index ef0cee12f..1ce19002c 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -53,20 +53,14 @@ jobs: strategy: fail-fast: true matrix: - os: [ubuntu-20.04, windows-latest] numpy: [1.20.3] python: [3.8.10, 3.7.9] # Patch version must be specified to avoid any cache confusion, since the cache key depends on the full Python version. If left unspecified, different patch versions could be allocated between jobs, and any such difference would lead to a cache not found error. - include: - - os: ubuntu-20.04 - activate_command: source venv/bin/activate - - os: windows-latest - activate_command: .\venv\Scripts\activate uses: ./.github/workflows/_lint.yaml with: - os: ${{ matrix.os }} + os: ubuntu-20.04 numpy: ${{ matrix.numpy }} python: ${{ matrix.python }} - activate_command: ${{ matrix.activate_command }} + activate_command: source venv/bin/activate # The idea behind these dependencies is we want to give feedback to # contributors on the version number only after they have passed all tests,