Assume Briefcase artifact name and drop redundant package tests

beeware · May 28, 2024 · eb2307a · eb2307a
1 parent a2b0ad5
commit eb2307a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/app-build-verify.yml b/.github/workflows/app-build-verify.yml
@@ -32,10 +32,6 @@ on:
         description: "The target format for the app, e.g. appimage, xcode, app, etc. Leave blank all supported formats."
         default: ""
         type: string
-      briefcase-artifact-name:
-        description: "Name of the GitHub artifact for the Briefcase package to install."
-        default: ""
-        type: string
       workflow-repo:
         # Only needed for PRs in other repos wanting to test new workflow changes before they are merged.
         # These inputs should not be specified by another repo on their main branch.
@@ -131,7 +127,8 @@ jobs:
       if: endsWith(inputs.repository, 'briefcase')
       uses: actions/download-artifact@v4.1.7
       with:
-        pattern: ${{ format('{0}*', inputs.briefcase-artifact-name) }}
+        # artifact name is derived in python-package-create.yml
+        pattern: "Packages-briefcase*"
         merge-multiple: true
         path: dist
 

diff --git a/.github/workflows/app-create-verify.yml b/.github/workflows/app-create-verify.yml
@@ -23,10 +23,6 @@ on:
         description: "GitHub repository to checkout; defaults to repo running this workflow."
         default: ${{ github.repository }}
         type: string
-      briefcase-artifact-name:
-        description: "Name of the GitHub artifact for the Briefcase package to install."
-        default: ""
-        type: string
       workflow-repo:
         # Only needed for PRs in other repos wanting to test new workflow changes before they are merged.
         # These inputs should not be specified by another repo on their main branch.
@@ -90,7 +86,8 @@ jobs:
       if: endsWith(inputs.repository, 'briefcase')
       uses: actions/download-artifact@v4.1.7
       with:
-        name: ${{ inputs.briefcase-artifact-name }}
+        # artifact name is derived in python-package-create.yml
+        name: "Packages-briefcase"
         path: dist
 
     - name: Install Briefcase Artefact

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -167,14 +167,12 @@ jobs:
       fail-fast: false
       matrix:
         name:
-        - beeware
+        - briefcase
         - briefcase-automation
         - gbulb
         - rubicon-objc
         - toga-core
         - toga-android
-        - toga-chart
-        - travertino
         include:
         - name: briefcase-automation
           repo: briefcase
@@ -186,23 +184,15 @@ jobs:
           repo: toga
           build-subdir: android
 
-  test-package-briefcase:
-    name: Package Briefcase
-    needs: pre-commit
-    uses: ./.github/workflows/python-package-create.yml
-    with:
-      repository: beeware/briefcase
-
   test-verify-projects-briefcase:
     name: Verify Project
-    needs: [ pre-commit, test-package-briefcase ]
+    needs: [ pre-commit, test-package-python ]
     uses: ./.github/workflows/app-create-verify.yml
     with:
       python-version: "3.10"  # must match system python for ubuntu version
       repository: beeware/briefcase
       runner-os: ${{ matrix.runner-os }}
       framework: ${{ matrix.framework }}
-      briefcase-artifact-name: ${{ needs.test-package-briefcase.outputs.artifact-name }}
     strategy:
       fail-fast: false
       matrix:
@@ -211,14 +201,13 @@ jobs:
 
   test-verify-apps-briefcase:
     name: Verify Briefcase
-    needs: [ pre-commit, test-package-python, test-package-briefcase ]
+    needs: [ pre-commit, test-package-python ]
     uses: ./.github/workflows/app-build-verify.yml
     with:
       python-version: "3.10"  # must match system python for ubuntu version
       repository: beeware/briefcase
       runner-os: ${{ matrix.runner-os }}
       framework: ${{ matrix.framework }}
-      briefcase-artifact-name: ${{ needs.test-package-briefcase.outputs.artifact-basename }}
     strategy:
       fail-fast: false
       matrix: