CI: Include provenance in names of collected artifacts

The currently given names to the uploaded archives are too
common and require (often manual) renaming for downloaded
archives that belong to different CI runs/attempts of a PR
and/or different PRs.  Let's automatically disambiguate such
archives from one another by giving them more unique names
for convenience and future reference.

related: #17704

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/.cirrus.yml b/.cirrus.yml
index 7a800207f6986c321f12e9e198fe12edcdd0c4b6..b8d9c785251a522a571f295115f5bafe666ddea1 100644 (file)
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -23,7 +23,7 @@ freebsd_task:
     - sudo -u cirrus make test
   on_failure:
     test_artifacts:
-      name: "Cirrus-CI-freebsd-failed-tests"
+      name: "Cirrus-${CIRRUS_BUILD_ID}-freebsd-failed-tests"
       path: |
         runtime/indent/testdir/*.fail
         runtime/syntax/testdir/failed/*

diff --git a/.github/actions/test_artifacts/action.yml b/.github/actions/test_artifacts/action.yml
index 44738c505ed4685eaa75126a2d93e5dd262cd586..cbab486c698f889dfca1a1508b1b773855ca6472 100644 (file)
--- a/.github/actions/test_artifacts/action.yml
+++ b/.github/actions/test_artifacts/action.yml
@@ -7,7 +7,7 @@ runs:
       uses: actions/upload-artifact@v4
       with:
         # Name of the artifact to upload.
-        name: ${{ github.workflow }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
+        name: GH-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
 
         # A file, directory or wildcard pattern that describes what
         # to upload.