diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml index 62076c9..83159c5 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. @@ -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,8 @@ 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='${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. diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml index 713246b..17a13e7 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. @@ -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 @@ -97,7 +98,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 @@ -122,15 +123,15 @@ 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 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 }}