From e6215dcef5c09c41b969db035d1c0ace8180d4cd Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 24 Jul 2026 07:14:59 +0800 Subject: [PATCH 1/3] Switch to using Ruff instead of flake8/black. --- .github/workflows/app-build-verify.yml | 2 +- .github/workflows/app-create-verify.yml | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index 813951d1..b0b4bc40 100644 --- a/.github/workflows/app-build-verify.yml +++ b/.github/workflows/app-build-verify.yml @@ -1,4 +1,4 @@ -name: Build App +name: Verify app build ####### # Verify building an app for a target platform, format, and framework on a particular OS. diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml index 21c17564..a8c3ae46 100644 --- a/.github/workflows/app-create-verify.yml +++ b/.github/workflows/app-create-verify.yml @@ -1,4 +1,4 @@ -name: Verify Project +name: Verify project creation ####### # Verify creating a project for a target framework on a particular OS. @@ -97,7 +97,7 @@ jobs: run: python -m pip install -U pip - name: Install Dependencies - run: python -m pip install --group './briefcase-template/pyproject.toml:create-verify' + run: python -m pip install --group './briefcase-template/pyproject.toml:verify' - name: Get Briefcase Package # Briefcase will build and package itself in a previous step in its CI @@ -124,13 +124,11 @@ jobs: # use the current repo checkout if briefcase-template is being tested briefcase-template-source: ${{ endsWith(inputs.repository, 'briefcase-template') && github.workspace || '' }} - - name: Run Flake8 + - name: Run Ruff working-directory: ${{ steps.create.outputs.project-path }} - run: flake8 --isolated --select=E --max-line-length 119 - - - name: Run Black - working-directory: ${{ steps.create.outputs.project-path }} - run: black --check --diff --color src/ + run: | + ruff check + ruff format - name: Validate pyproject.toml working-directory: ${{ steps.create.outputs.project-path }} From a4236ca6dffcd02551539b87a7513c8c7815a298 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Wed, 11 Nov 2026 18:51:17 +0000 Subject: [PATCH 2/3] Checkout inputs.repository into a subdirectory --- .github/workflows/app-build-verify.yml | 7 +++++-- .github/workflows/app-create-verify.yml | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index 3624c45e..f8768b37 100644 --- a/.github/workflows/app-build-verify.yml +++ b/.github/workflows/app-build-verify.yml @@ -110,6 +110,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: ${{ inputs.repository }} + path: inputs-repository fetch-depth: 0 persist-credentials: false @@ -185,7 +186,9 @@ jobs: with: framework: ${{ inputs.framework }} # use the current repo checkout if briefcase-template is being tested - briefcase-template-source: ${{ endsWith(inputs.repository, 'briefcase-template') && github.workspace || '' }} + briefcase-template-source: >- + ${{ endsWith(inputs.repository, 'briefcase-template') + && format('{0}/inputs-repository', github.workspace) || '' }} enable-automation: true - name: Determine Output Format Configuration @@ -194,7 +197,7 @@ jobs: if: endsWith(inputs.repository, '-template') && inputs.repository != 'beeware/briefcase-template' id: output-format run: | - echo "template-override=--config template='${GITHUB_WORKSPACE}'" | tee -a "${GITHUB_OUTPUT}" + echo "template-override=--config template='$(pwd)/inputs-repository'" | tee -a "${GITHUB_OUTPUT}" # In the steps below, the builtin functions (i.e. contains, startsWith, etc.) # are used for comparison (instead of ==) because they are case-insensitive. diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml index e6eb518f..17a13e7c 100644 --- a/.github/workflows/app-create-verify.yml +++ b/.github/workflows/app-create-verify.yml @@ -60,6 +60,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: repository: ${{ inputs.repository }} + path: inputs-repository fetch-depth: 0 persist-credentials: false @@ -122,7 +123,9 @@ jobs: with: framework: ${{ inputs.framework }} # use the current repo checkout if briefcase-template is being tested - briefcase-template-source: ${{ endsWith(inputs.repository, 'briefcase-template') && github.workspace || '' }} + briefcase-template-source: >- + ${{ endsWith(inputs.repository, 'briefcase-template') + && format('{0}/inputs-repository', github.workspace) || '' }} - name: Run Ruff working-directory: ${{ steps.create.outputs.project-path }} From 6d8112f7c2417bd6b5577b1a88b5b9f65f53271e Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Wed, 11 Nov 2026 19:15:23 +0000 Subject: [PATCH 3/3] Fix Windows path syntax --- .github/workflows/app-build-verify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index f8768b37..83159c52 100644 --- a/.github/workflows/app-build-verify.yml +++ b/.github/workflows/app-build-verify.yml @@ -197,7 +197,8 @@ jobs: if: endsWith(inputs.repository, '-template') && inputs.repository != 'beeware/briefcase-template' id: output-format run: | - echo "template-override=--config template='$(pwd)/inputs-repository'" | tee -a "${GITHUB_OUTPUT}" + echo "template-override=--config template='${GITHUB_WORKSPACE}/inputs-repository'" \ + | tee -a "${GITHUB_OUTPUT}" # In the steps below, the builtin functions (i.e. contains, startsWith, etc.) # are used for comparison (instead of ==) because they are case-insensitive.