summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2022-08-04 09:24:17 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2022-08-04 10:05:31 +1000
commit3fbe5770cc0b1a3f8a775dad41386fe06c35b1c8 (patch)
treee7cba5518299729badb35ec3609e558ae174b8f0
parentc9c23e5e42ba7695f1f8dfbc29c7d1bca4d3b42e (diff)
downloadlibwacom-3fbe5770cc0b1a3f8a775dad41386fe06c35b1c8.tar.gz
CI: adjust the artifact names according to the job
Multiple artifacts with the same name only work if they're in the same job. We use a matrix here, so our resulting artifact is simply whichever job finished last. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--.github/workflows/main.yml6
1 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ca02543..0879387 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -45,14 +45,16 @@ jobs:
- uses: actions/upload-artifact@v2
if: ${{ always() }} # even if we fail
with:
- name: meson test logs
+ name: meson test logs-${{matrix.compiler}} ${{matrix.meson_options}}
path: |
builddir/meson-logs/testlog*.txt
builddir/meson-logs/meson-log.txt
# move the tarball to the top level
- name: move tarballs to top level
run: mv builddir/meson-dist/libwacom-*tar.xz .
+ # We only need one tarball for the build-from-tarball job
- uses: actions/upload-artifact@v2
+ if: ${{ matrix.compiler == 'gcc' && matrix.meson_options == '' }}
with:
name: tarball
path: libwacom-*tar.xz
@@ -84,7 +86,7 @@ jobs:
- uses: actions/upload-artifact@v2
if: ${{ always() }} # even if we fail
with:
- name: meson test logs
+ name: meson test logs-valgrind
path: |
builddir/meson-logs/testlog*.txt
builddir/meson-logs/meson-log.txt