From 504ac29b5096f31c499ece83d916dbab5cc4c27c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Sep 2024 20:30:57 +0000 Subject: [PATCH 1/2] Bump actions/setup-python from 5.1.1 to 5.2.0 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.1.1 to 5.2.0. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v5.1.1...v5.2.0) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/app-build-verify.yml | 2 +- .github/workflows/app-create-verify.yml | 2 +- .github/workflows/ci.yml | 4 ++-- .github/workflows/dep-version-bump.yml | 2 +- .github/workflows/pre-commit-run.yml | 2 +- .github/workflows/pre-commit-update.yml | 2 +- .github/workflows/towncrier-run.yml | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index 0c26736..f849b6a 100644 --- a/.github/workflows/app-build-verify.yml +++ b/.github/workflows/app-build-verify.yml @@ -113,7 +113,7 @@ jobs: - name: Set Up Python # Linux System apps requires python is System Python to run the app if: ${{ !startsWith(inputs.runner-os, 'ubuntu') || !startsWith(inputs.python-version, steps.config.outputs.system-python-version) }} - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: ${{ inputs.python-version }} cache: pip diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml index e55b4f2..35841f3 100644 --- a/.github/workflows/app-create-verify.yml +++ b/.github/workflows/app-create-verify.yml @@ -68,7 +68,7 @@ jobs: path: briefcase-template - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: ${{ inputs.python-version }} cache: pip diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9f25b46..8d76238 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -108,7 +108,7 @@ jobs: uses: actions/checkout@v4.1.7 - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: 3.X cache: pip @@ -211,7 +211,7 @@ jobs: path: repos/.github-beeware - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: "3.x" diff --git a/.github/workflows/dep-version-bump.yml b/.github/workflows/dep-version-bump.yml index 9572f5b..d47e299 100644 --- a/.github/workflows/dep-version-bump.yml +++ b/.github/workflows/dep-version-bump.yml @@ -70,7 +70,7 @@ jobs: git config user.name "Brutus (robot)" - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: 3.X diff --git a/.github/workflows/pre-commit-run.yml b/.github/workflows/pre-commit-run.yml index 6f53551..1947512 100644 --- a/.github/workflows/pre-commit-run.yml +++ b/.github/workflows/pre-commit-run.yml @@ -41,7 +41,7 @@ jobs: repository: ${{ inputs.repository }} - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: ${{ inputs.python-version }} cache: pip diff --git a/.github/workflows/pre-commit-update.yml b/.github/workflows/pre-commit-update.yml index ae07108..dbf1bf2 100644 --- a/.github/workflows/pre-commit-update.yml +++ b/.github/workflows/pre-commit-update.yml @@ -73,7 +73,7 @@ jobs: git config user.name "Brutus (robot)" - name: Set up Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: 3.X cache: pip diff --git a/.github/workflows/towncrier-run.yml b/.github/workflows/towncrier-run.yml index b4ca002..b986a12 100644 --- a/.github/workflows/towncrier-run.yml +++ b/.github/workflows/towncrier-run.yml @@ -52,7 +52,7 @@ jobs: fetch-depth: 0 - name: Setup Python - uses: actions/setup-python@v5.1.1 + uses: actions/setup-python@v5.2.0 with: python-version: ${{ inputs.python-version }} cache: pip From be005da3799c5c9f4289c4e4308a7559e8bf4ca0 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Mon, 2 Sep 2024 09:13:55 +0800 Subject: [PATCH 2/2] Disable AppImage testing until manylinux_2_34 is available. --- .github/workflows/app-build-verify.yml | 101 ++++++++++++++----------- 1 file changed, 55 insertions(+), 46 deletions(-) diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index f849b6a..a4c4d35 100644 --- a/.github/workflows/app-build-verify.yml +++ b/.github/workflows/app-build-verify.yml @@ -368,52 +368,61 @@ jobs: docker run --volume $(pwd)/dist:/dist opensuse/tumbleweed \ sh -c "zypper --non-interactive --no-gpg-checks install --dry-run /dist/*-0.0.1-1.x86_64.rpm" - - name: Build AppImage Project - # 2023-09-11 AppImage dropped to "best effort" support. - # - # AppImage builds are the slowest, because they're incompatible with binary wheels; - # and installing Linux GUI toolkits (which are on a constant "install the latest" - # push) is fundamentally incompatible with using an old base image. As of today, - # it's impossible to install Toga on *any* manylinux image ( - # https://gitlab.gnome.org/GNOME/pygobject/-/issues/590); PySide2 can't be - # installed on any *supported* manylinux image; PySide6 only publishes 2_28 wheels, - # but even then, it segfaults when the AppImage starts. - # - # Even when the install *does* work, there are so many incompatibility and - # binary dependency issues that it's just not worth the oxygen to keep this thing - # alive. - # - # Only runs when target platform and format are explicitly Linux and AppImage. - if: > - startsWith(inputs.runner-os, 'ubuntu') - && contains(fromJSON('["Linux"]'), inputs.target-platform) - && contains(fromJSON('["AppImage"]'), inputs.target-format) - working-directory: ${{ steps.create.outputs.project-path }} - env: - PKG_TAG: ${{ steps.docker.outputs.tag-base }}-appimage - run: | - PACKAGES="libfuse2" - case "$(tr '[:upper:]' '[:lower:]' <<< '${{ inputs.framework }}')" in - toga ) PACKAGES="${PACKAGES} ${{ env.TOGA_SYSTEM_REQUIRES }}" ;; - pyside6 ) PACKAGES="${PACKAGES} ${{ env.PYSIDE6_SYSTEM_REQUIRES }}" ;; - esac - - sudo apt install -y --no-install-recommends ${PACKAGES} - - # PyGObject>=3.46.0 requires a version of glibc that isn't available in manylinux images; - # so, the version is constrained to successfully build an AppImage with Toga. - # Furthermore, Toga>0.3.1 requires PyGObject>=3.46.0 so its version is constrained as well. - if [ "${{ startsWith(inputs.framework, 'toga') }}" = "true" ]; then - CONFIG_OVERRIDE_REQUIRES='--config requires=["toga-gtk==0.3.1","PyGobject<3.46.0"]' - fi - - briefcase create linux AppImage \ - ${{ steps.output-format.outputs.template-override }} \ - ${CONFIG_OVERRIDE_REQUIRES} \ - ${DOCKER_BUILDX_OPTIONS//__PKG_TAG__/${PKG_TAG}} - briefcase build linux AppImage - xvfb-run briefcase run linux AppImage - briefcase package linux AppImage --adhoc-sign + # 2024-09-02 AppImage testing disabled entirely In Briefcase#1977, the + # Bootstrap app was updated to use a Toga API introduced in Toga 0.4.6. This + # is a problem because we're limited to Toga 0.3.1 for AppImage testing; we + # can't install the version of PyGObject we need on manylinux_2_28. + # manylinux_2_34 is in preparation (see pypa/manylinux#1585); but until that + # base image is available, we can't test AppImage without also making + # changes to Briefcase to support *very* old versions of Toga in testing. + # + # The configuration has been commented out for now, in the hope it might be + # able to be restored when manylinux_2_34 is finalized; however, it's + # essentially a race to see whether manylinux_2_34 is updated before we + # finally complete the deprecation of AppImage. + # + # - name: Build AppImage Project + # # 2023-09-11 AppImage dropped to "best effort" support. + # # + # # AppImage builds are the slowest, because they're incompatible with binary wheels; + # # and installing Linux GUI toolkits (which are on a constant "install the latest" + # # push) is fundamentally incompatible with using an old base image. As of today, + # # it's impossible to install Toga on *any* manylinux image ( + # # https://gitlab.gnome.org/GNOME/pygobject/-/issues/590); PySide2 can't be + # # installed on any *supported* manylinux image; PySide6 only publishes 2_28 wheels, + # # but even then, it segfaults when the AppImage starts. + # # + # # Even when the install *does* work, there are so many incompatibility and + # # binary dependency issues that it's just not worth the oxygen to keep this thing + # # alive. + # # + # # Only runs when target platform and format are explicitly Linux and AppImage. + # if: > startsWith(inputs.runner-os, 'ubuntu') && + # contains(fromJSON('["Linux"]'), inputs.target-platform) && + # contains(fromJSON('["AppImage"]'), inputs.target-format) + # working-directory: ${{ steps.create.outputs.project-path }} env: + # PKG_TAG: ${{ steps.docker.outputs.tag-base }}-appimage run: | + # PACKAGES="libfuse2" case "$(tr '[:upper:]' '[:lower:]' <<< '${{ + # inputs.framework }}')" in toga ) PACKAGES="${PACKAGES} ${{ + # env.TOGA_SYSTEM_REQUIRES }}" ;; pyside6 ) PACKAGES="${PACKAGES} ${{ + # env.PYSIDE6_SYSTEM_REQUIRES }}" ;; esac + + # sudo apt install -y --no-install-recommends ${PACKAGES} + + # # PyGObject>=3.46.0 requires a version of glibc that isn't available in manylinux images; + # # so, the version is constrained to successfully build an AppImage with Toga. + # # Furthermore, Toga>0.3.1 requires PyGObject>=3.46.0 so its version is constrained as well. + # if [ "${{ startsWith(inputs.framework, 'toga') }}" = "true" ]; then + # CONFIG_OVERRIDE_REQUIRES='--config requires=["toga-gtk==0.3.1","PyGobject<3.46.0"]' + # fi + + # briefcase create linux AppImage \ + # ${{ steps.output-format.outputs.template-override }} \ + # ${CONFIG_OVERRIDE_REQUIRES} \ + # ${DOCKER_BUILDX_OPTIONS//__PKG_TAG__/${PKG_TAG}} + # briefcase build linux AppImage + # xvfb-run briefcase run linux AppImage + # briefcase package linux AppImage --adhoc-sign - name: Delete Docker Images # the GitHub runners come with limited disk space; these images take ~8GB