Skip to content

Do some CI cleanup to make reports clearer and future changes easier #1989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 4, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/alpine-test.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: test-alpine
on: [push, pull_request, workflow_dispatch]

jobs:
build:
test:
runs-on: ubuntu-latest

container:
4 changes: 2 additions & 2 deletions .github/workflows/cygwin-test.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ name: test-cygwin
on: [push, pull_request, workflow_dispatch]

jobs:
build:
test:
runs-on: windows-latest

strategy:
@@ -30,7 +30,7 @@ jobs:
- name: Set up Cygwin
uses: egor-tensin/setup-cygwin@v4
with:
packages: python39=3.9.16-1 python39-pip python39-virtualenv git
packages: python39 python39-pip python39-virtualenv git

- name: Arrange for verbose output
run: |
25 changes: 13 additions & 12 deletions .github/workflows/pythonpackage.yml
Original file line number Diff line number Diff line change
@@ -9,23 +9,24 @@ permissions:
contents: read

jobs:
build:
test:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
include:
- experimental: false
- os: ubuntu-22.04
os-type: [ubuntu, macos, windows]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
exclude:
- os-type: macos
python-version: "3.7"
experimental: false
- os: windows-latest
include:
- os-ver: latest
- os-type: ubuntu
python-version: "3.7"
experimental: false
os-ver: "22.04"
- experimental: false

fail-fast: false

runs-on: ${{ matrix.os }}
runs-on: ${{ matrix.os-type }}-${{ matrix.os-ver }}

defaults:
run:
@@ -43,7 +44,7 @@ jobs:
allow-prereleases: ${{ matrix.experimental }}

- name: Set up WSL (Windows)
if: startsWith(matrix.os, 'windows')
if: matrix.os-type == 'windows'
uses: Vampire/setup-wsl@v4.0.0
with:
distribution: Alpine
@@ -80,7 +81,7 @@ jobs:

# For debugging hook tests on native Windows systems that may have WSL.
- name: Show bash.exe candidates (Windows)
if: startsWith(matrix.os, 'windows')
if: matrix.os-type == 'windows'
run: |
set +e
bash.exe -c 'printenv WSL_DISTRO_NAME; uname -a'