Skip to content
Closed
Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion .github/actions/app-create/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ runs:
case "$(tr '[:upper:]' '[:lower:]' <<< "${INPUT_FRAMEWORK}")" in
toga ) BOOTSTRAP=Toga ;;
pyside6 ) BOOTSTRAP=PySide6 ;;
pygame ) BOOTSTRAP=Pygame ;;
console ) BOOTSTRAP=Console ;;
* ) BOOTSTRAP="${INPUT_FRAMEWORK}" ;;
esac
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/app-build-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ jobs:
contents: read
env:
PYSIDE6_SYSTEM_REQUIRES: libgl1 libqt6dbus6 libqt6gui6t64 libxcb-cursor0
SDL_AUDIODRIVER: dummy # disable audio for SDL
TOGA_SYSTEM_REQUIRES: libcairo2-dev libcanberra-gtk3-module libegl1 libgirepository1.0-dev libgirepository-2.0-dev libthai-dev gir1.2-gtk-3.0
steps:

Expand Down Expand Up @@ -207,8 +206,6 @@ jobs:
&& contains(fromJSON('["", "app"]'), inputs.target-format)
working-directory: ${{ steps.create.outputs.project-path }}
env:
# SDL cannot always find hardware acceleration on macOS in CI
SDL_VIDEODRIVER: ${{ startsWith(inputs.framework, 'pygame') && 'dummy' || '' }}
CREATE_OPTIONS: ${{ steps.output-format.outputs.template-override }} ${{ inputs.create-options }}
run: |
briefcase create macOS app ${CREATE_OPTIONS} ${BRIEFCASE_VERBOSITY}
Expand All @@ -226,8 +223,6 @@ jobs:
&& contains(fromJSON('["", "Xcode"]'), inputs.target-format)
working-directory: ${{ steps.create.outputs.project-path }}
env:
# SDL cannot always find hardware acceleration on macOS in CI
SDL_VIDEODRIVER: ${{ startsWith(inputs.framework, 'pygame') && 'dummy' || '' }}
CREATE_OPTIONS: ${{ steps.output-format.outputs.template-override }} ${{ inputs.create-options }}
run: |
briefcase create macOS Xcode ${CREATE_OPTIONS} ${BRIEFCASE_VERBOSITY}
Expand Down Expand Up @@ -339,11 +334,9 @@ jobs:

- name: Build Linux System Project (Arch, Dockerized)
# Arch is not officially supported on ARM
# Arch can't build PyGame apps until they publish 3.14 binary wheels
if: >
startsWith(inputs.runner-os, 'ubuntu')
&& !endsWith(inputs.runner-os, '-arm')
&& !startsWith(inputs.framework, 'pygame')
&& contains(fromJSON('["", "Linux"]'), inputs.target-platform)
&& contains(fromJSON('["", "system"]'), inputs.target-format)
working-directory: ${{ steps.create.outputs.project-path }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ toga, pyside6, pygame, console ]
framework: [ toga, pyside6, console ]
runner-os: [ ubuntu-24.04, ubuntu-24.04-arm ]

# see app-build-verify.yml; AppImage testing was disabled sept 2024
Expand All @@ -308,7 +308,7 @@ jobs:
# fail-fast: false
# matrix:
# # 2024-07-11 (beeware/briefcase#1908): pyside6 segfaults on AppImage start.
# framework: [ toga, pygame, console ]
# framework: [ toga, console ]

test-app-build-verify-linux-flatpak:
name: App Build Verify (Flatpak template)
Expand All @@ -323,7 +323,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ toga, pyside6, pygame, console ]
framework: [ toga, pyside6, console ]
runner-os: [ ubuntu-24.04, ubuntu-24.04-arm ]

exclude:
Expand All @@ -345,7 +345,7 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ toga, pyside6, pygame, console ]
framework: [ toga, pyside6, console ]
format: [ app, Xcode ]

test-app-build-verify-web:
Expand Down Expand Up @@ -376,5 +376,5 @@ jobs:
strategy:
fail-fast: false
matrix:
framework: [ toga, pyside6, pygame, console ]
framework: [ toga, pyside6, console ]
format: [ app, VisualStudio ]
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
venv
.envrc
.vscode
.idea
*.pyc
*.egg-info
.kilo
.opencode
Loading