From ff4f23152e2d8a13fa93bd8fae4a67e5dc8b6dd4 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 16 Oct 2024 08:00:41 +0800 Subject: [PATCH 1/3] Switch to explicit linux system handling. --- .github/workflows/ci.yml | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc482f1..93db1d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,9 @@ jobs: verify-projects: name: Verify project needs: unit-tests - uses: beeware/.github/.github/workflows/app-create-verify.yml@main + # TODO: Revert to main when .github#172 is merged + # uses: beeware/.github/.github/workflows/app-create-verify.yml@main + uses: beeware/.github/.github/workflows/app-create-verify.yml@599f2fbb61c17aa94a962f26647f31a879a31052 with: runner-os: ${{ matrix.runner-os }} framework: ${{ matrix.framework }} @@ -55,23 +57,28 @@ jobs: fail-fast: false matrix: framework: [ "toga", "pyside6", "pygame" ] - runner-os: [ "macos-latest", "ubuntu-22.04", "windows-latest" ] + runner-os: [ "macos-latest", "ubuntu-latest", "windows-latest" ] verify-apps: name: Build app needs: unit-tests - uses: beeware/.github/.github/workflows/app-build-verify.yml@main + # TODO: Revert to main when .github#172 is merged + # uses: beeware/.github/.github/workflows/app-build-verify.yml@main + uses: beeware/.github/.github/workflows/app-build-verify.yml@599f2fbb61c17aa94a962f26647f31a879a31052 with: - # This *must* be the version of Python that is the native system Python on - # ubuntu-22.04, which is needed to test local Debian packages. We use - # ubuntu-22.04 explicitly rather than ubuntu-latest because when - # ubuntu-latest upgrades to ubuntu-24.04, it will happen gradually, so the - # system Python version won't be predictable. - python-version: "3.10" + python-version: ${{ matrix.python-version }} runner-os: ${{ matrix.runner-os }} framework: ${{ matrix.framework }} strategy: fail-fast: false matrix: framework: [ "toga", "pyside6", "pygame" ] - runner-os: [ "macos-latest", "ubuntu-22.04", "windows-latest" ] + runner-os: [ "macos-latest", "ubuntu-latest", "windows-latest" ] + + include: + # A version of Python that is supported by all the GUI toolkits. + - python-version: "3.12" + + # Ubuntu must always use the system Python + - runner-os: ubuntu-latest + python-version: system From 0662ec8ace8d02367ec1c7a6c5496aea27f79c35 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 16 Oct 2024 08:30:14 +0800 Subject: [PATCH 2/3] Add console testing to CI. --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 93db1d7..d536439 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [ "toga", "pyside6", "pygame" ] + framework: [ "toga", "pyside6", "pygame", "console" ] runner-os: [ "macos-latest", "ubuntu-latest", "windows-latest" ] verify-apps: @@ -72,7 +72,7 @@ jobs: strategy: fail-fast: false matrix: - framework: [ "toga", "pyside6", "pygame" ] + framework: [ "toga", "pyside6", "pygame", "console" ] runner-os: [ "macos-latest", "ubuntu-latest", "windows-latest" ] include: From 07b6bba7ac5dc0dc7ef2071b474d90517705a05e Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Wed, 16 Oct 2024 09:06:13 +0800 Subject: [PATCH 3/3] Revert to main version of workflows. --- .github/workflows/ci.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d536439..5890c9d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,9 +47,7 @@ jobs: verify-projects: name: Verify project needs: unit-tests - # TODO: Revert to main when .github#172 is merged - # uses: beeware/.github/.github/workflows/app-create-verify.yml@main - uses: beeware/.github/.github/workflows/app-create-verify.yml@599f2fbb61c17aa94a962f26647f31a879a31052 + uses: beeware/.github/.github/workflows/app-create-verify.yml@main with: runner-os: ${{ matrix.runner-os }} framework: ${{ matrix.framework }} @@ -62,9 +60,7 @@ jobs: verify-apps: name: Build app needs: unit-tests - # TODO: Revert to main when .github#172 is merged - # uses: beeware/.github/.github/workflows/app-build-verify.yml@main - uses: beeware/.github/.github/workflows/app-build-verify.yml@599f2fbb61c17aa94a962f26647f31a879a31052 + uses: beeware/.github/.github/workflows/app-build-verify.yml@main with: python-version: ${{ matrix.python-version }} runner-os: ${{ matrix.runner-os }}