Keep packages at the same paths throughout test and release workflows

beeware · Nov 8, 2022 · 594d2d4 · 594d2d4
1 parent ab01e7c
commit 594d2d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,9 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: packages
-        path: ${{ matrix.subdir }}/dist/*
+        # There will only be one dist directory for each matrix sub-job, but using a
+        # leading wildcard preserves the directory structure.
+        path: "*/dist/*"
         if-no-files-found: error
 
   core:
@@ -80,10 +82,9 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: packages
-        path: dist
     - name: Test
       env:
-        TOGA_INSTALL_COMMAND: 'bash -c "pip install ../dist/toga_{core,dummy}*.whl"'
+        TOGA_INSTALL_COMMAND: 'bash -c "pip install ../{core,dummy}/dist/*.whl"'
       run: |
         cd core
         tox -e py
@@ -182,14 +183,13 @@ jobs:
       uses: actions/download-artifact@v3
       with:
         name: packages
-        path: dist
     - name: Install dependencies
       run: |
         ${{ matrix.pre-command }}
         python -m pip install tox coverage[toml]
     - name: Test
       env:
-        TOGA_INSTALL_COMMAND: 'bash -c "pip install ../dist/toga_{core,dummy,${{ matrix.backend }}}*.whl"'
+        TOGA_INSTALL_COMMAND: 'bash -c "pip install ../{core,dummy,${{ matrix.backend }}}/dist/*.whl"'
       run: |
         cd ${{ matrix.backend }}
         tox -e py

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,12 +23,11 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: packages
-          path: packages
       - uses: ncipollo/[email protected]
         with:
           name: ${{ env.VERSION }}
           draft: true
-          artifacts: "packages/*"
+          artifacts: "*/dist/*"
           artifactErrorsFailBuild: true
 
   deploy-test: