From d75e35c90ddcdd47a2e73fd0c17458b75f8dd195 Mon Sep 17 00:00:00 2001
From: Russell Martin <russell@rjm.li>
Date: Tue, 24 Oct 2023 12:30:49 -0400
Subject: [PATCH] Add support to test Flatpak with PyGame

---
 .github/workflows/app-build-verify.yml |  2 +-
 .github/workflows/ci.yml               | 24 ++++++++++++++----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml
index 7e961a01..7057476e 100644
--- a/.github/workflows/app-build-verify.yml
+++ b/.github/workflows/app-build-verify.yml
@@ -273,7 +273,7 @@ jobs:
         startsWith(inputs.runner-os, 'ubuntu')
         && contains(fromJSON('["", "Linux"]'), inputs.target-platform)
         && contains(fromJSON('["", "Flatpak"]'), inputs.target-format)
-        && startsWith(inputs.framework, 'toga')
+        && contains(fromJSON('["Toga", "PyGame"]'), inputs.framework)
       run: |
         sudo apt-get update -y
         sudo apt-get install -y flatpak flatpak-builder
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 435a1e45..3725a50e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -220,7 +220,7 @@ jobs:
     needs: [pre-commit, test-package-python]
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase
       runner-os: ${{ matrix.runner-os }}
       framework: ${{ matrix.framework }}
@@ -235,7 +235,7 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-template
       briefcase-template-source: "../../"
       runner-os: ${{ matrix.runner-os }}
@@ -251,7 +251,7 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-android-gradle-template
       runner-os: ${{ matrix.runner-os }}
       target-platform: android
@@ -267,7 +267,7 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-iOS-xcode-template
       runner-os: macos-latest
       target-platform: iOS
@@ -297,7 +297,7 @@ jobs:
   #   needs: pre-commit
   #   uses: ./.github/workflows/app-build-verify.yml
   #   with:
-  #     python-version: "3.9"
+  #     python-version: "3.11"
   #     repository: beeware/briefcase-linux-appimage-template
   #     runner-os: ubuntu-latest
   #     target-platform: linux
@@ -313,19 +313,23 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-linux-flatpak-template
       runner-os: ubuntu-latest
       target-platform: linux
       target-format: flatpak
-      framework: toga
+      framework: ${{ matrix.framework }}
+    strategy:
+      fail-fast: false
+      matrix:
+        framework: [ "toga", "pygame" ]
 
   test-verify-apps-macOS-templates:
     name: Test Verify macOS App
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-macos-${{ matrix.format }}-template
       runner-os: macos-latest
       target-platform: macOS
@@ -342,7 +346,7 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       repository: beeware/briefcase-web-static-template
       runner-os: ubuntu-latest
       target-platform: web
@@ -354,7 +358,7 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "3.9"
+      python-version: "3.11"
       python-source: ${{ matrix.python-source }}
       repository: beeware/briefcase-windows-${{ matrix.format }}-template
       runner-os: windows-latest