Make system an invalid value on macOS/Windows.

beeware · Oct 14, 2024 · 02b0580 · 02b0580
1 parent 464871d
commit 02b0580
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml
@@ -111,14 +111,13 @@ jobs:
         path: ${{ steps.config.outputs.briefcase-data-dir }}
 
     - name: Set Up Python
-      # On Linux, we can use the system python as-is. On macOS/Windows, install
-      # a Python that matches the version provided as a system default. This is
-      # to avoid issues with trying to install packages into homebrew's python
-      # without requiring sudo.
+      # On Linux, accept "system" as a proxy for "don't install Python"; this will
+      # fall back to the system-provided Python package. Providing "system" as a value
+      # on macOS or Windows will cause an error.
       if: ${{ !startsWith(inputs.runner-os, 'ubuntu') || inputs.python-version != 'system' }}
       uses: actions/setup-python@v5.2.0
       with:
-        python-version: ${{ inputs.python-version == 'system' && steps.config.outputs.system-python-version || inputs.python-version }}
+        python-version: ${{ inputs.python-version }}
         allow-prereleases: true
         cache: pip
         cache-dependency-path: |

diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml
@@ -73,10 +73,13 @@ jobs:
         path: briefcase-template
 
     - name: Set up Python
-      # Always set up a Python, so that dependencies can be installed without sudo access
+      # On Linux, accept a value of "system", which will install a version of
+      # Python matching the system version. We can't use the actual system
+      # install because we need to install dependencies, which would either
+      # require the use of sudo, or extra workarounds for user-space packages.
       uses: actions/setup-python@v5.2.0
       with:
-        python-version: ${{ inputs.python-version == 'system' && steps.config.outputs.system-python-version || inputs.python-version }}
+        python-version: ${{ startsWith(inputs.runner-os, 'ubuntu') && inputs.python-version == 'system' && steps.config.outputs.system-python-version || inputs.python-version }}
         cache: pip
         allow-prereleases: true
         cache-dependency-path: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -261,7 +261,6 @@ jobs:
     needs: [ pre-commit, test-package-python ]
     uses: ./.github/workflows/app-create-verify.yml
     with:
-      python-version: "system"  # must match system python for ubuntu version
       repository: beeware/briefcase
       runner-os: ${{ matrix.runner-os }}
       framework: ${{ matrix.framework }}
@@ -270,13 +269,16 @@ jobs:
       matrix:
         framework: [ toga, pyside6 ]
         runner-os: [ macos-latest, windows-latest, ubuntu-22.04 ]
+        includes:
+          # Ubuntu apps need to run on the system Python
+          - runner-os: ubuntu-22.04
+            python-version: "system"
 
   test-verify-apps-briefcase:
     name: Verify Briefcase
     needs: [ pre-commit, test-package-python ]
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "system"  # must match system python for ubuntu version
       repository: beeware/briefcase
       runner-os: ${{ matrix.runner-os }}
       framework: ${{ matrix.framework }}
@@ -285,6 +287,10 @@ jobs:
       matrix:
         framework: [ toga ]
         runner-os: [ macos-latest, windows-latest, ubuntu-22.04 ]
+        includes:
+          # Ubuntu apps need to run on the system Python
+          - runner-os: ubuntu-22.04
+            python-version: "system"
 
   test-verify-apps-briefcase-template:
     name: Verify Briefcase Template
@@ -337,7 +343,8 @@ jobs:
     needs: pre-commit
     uses: ./.github/workflows/app-build-verify.yml
     with:
-      python-version: "system"  # must match system python for ubuntu version
+      # Ubuntu apps need to run on the system Python
+      python-version: "system"
       repository: beeware/briefcase-linux-system-template
       runner-os: ubuntu-22.04
       target-platform: linux