This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 1907eb1adba chore: Specify a suffix for GitHub Actions upload artifact
1907eb1adba is described below
commit 1907eb1adbaca258261f162a26d0291ffb502aaa
Author: Aurélien Pupier <[email protected]>
AuthorDate: Tue Jun 4 12:07:32 2024 +0200
chore: Specify a suffix for GitHub Actions upload artifact
it is mandatory to not override artifact since v4.
To avoid clash, passing specific suffix for matrix jobs
Signed-off-by: Aurélien Pupier <[email protected]>
---
.github/actions/component-test/action.yaml | 8 ++++++--
.github/actions/incremental-build/action.yaml | 8 ++++++--
.github/actions/quick-test/action.yaml | 6 +++++-
.github/workflows/pr-build-camel-3.yml | 1 +
.github/workflows/pr-build-camel-40x.yml | 1 +
.github/workflows/pr-build-main.yml | 1 +
.github/workflows/pr-comment.yml | 1 +
7 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/.github/actions/component-test/action.yaml
b/.github/actions/component-test/action.yaml
index c10f40bc39a..83ec84e7102 100644
--- a/.github/actions/component-test/action.yaml
+++ b/.github/actions/component-test/action.yaml
@@ -30,6 +30,10 @@ inputs:
comment-body:
description: 'Body of the comment to process'
required: true
+ artifact-upload-suffix:
+ description: 'Suffix for artifacts stored'
+ required: false
+ default: ''
runs:
using: "composite"
steps:
@@ -48,7 +52,7 @@ runs:
if: always()
with:
name: build.log
- path: build.log
+ path: build-${{ artifact-upload-suffix }}.log
- name: maven test
shell: bash
run: ${{ github.action_path }}/component-test.sh
@@ -61,7 +65,7 @@ runs:
uses: actions/upload-artifact@v3
if: always()
with:
- name: tests.log
+ name: tests-${{ artifact-upload-suffix }}.log
path: tests.log
- name: Success comment
if: success()
diff --git a/.github/actions/incremental-build/action.yaml
b/.github/actions/incremental-build/action.yaml
index 30e1d377e21..d4545f455d6 100644
--- a/.github/actions/incremental-build/action.yaml
+++ b/.github/actions/incremental-build/action.yaml
@@ -35,6 +35,10 @@ inputs:
description: 'The GitHub repository name (example, apache/camel)'
required: false
default: 'apache/camel'
+ artifact-upload-suffix:
+ description: 'Suffix for artifacts stored'
+ required: false
+ default: ''
runs:
using: "composite"
steps:
@@ -51,5 +55,5 @@ runs:
uses: actions/upload-artifact@v4
if: always()
with:
- name: incremental-${{ inputs.mode }}.log
- path: incremental-${{ inputs.mode }}.log
+ name: incremental-${{ inputs.mode }}-${{ artifact-upload-suffix }}.log
+ path: incremental-${{ inputs.mode }}-${{ artifact-upload-suffix }}.log
diff --git a/.github/actions/quick-test/action.yaml
b/.github/actions/quick-test/action.yaml
index c8fb8e4eb63..af0fe214dd7 100644
--- a/.github/actions/quick-test/action.yaml
+++ b/.github/actions/quick-test/action.yaml
@@ -27,6 +27,10 @@ inputs:
github-token: # id of input
description: 'Github hub token'
required: true
+ artifact-upload-suffix:
+ description: 'Suffix for artifacts stored'
+ required: false
+ default: ''
outputs:
result:
description: "Quick test result"
@@ -53,5 +57,5 @@ runs:
uses: actions/upload-artifact@v4
if: always()
with:
- name: test-logs
+ name: test-logs-${{ artifact-upload-suffix }}
path: automated-build-log/**/*
diff --git a/.github/workflows/pr-build-camel-3.yml
b/.github/workflows/pr-build-camel-3.yml
index bffc9f710b6..536265c8687 100644
--- a/.github/workflows/pr-build-camel-3.yml
+++ b/.github/workflows/pr-build-camel-3.yml
@@ -103,3 +103,4 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
start-commit: ${{ github.event.pull_request.base.sha }}
end-commit: ${{ github.event.after }}
+ artifact-upload-suffix: java-${{ matrix.java }}
diff --git a/.github/workflows/pr-build-camel-40x.yml
b/.github/workflows/pr-build-camel-40x.yml
index bb5ca47f5a7..61f09e4083b 100644
--- a/.github/workflows/pr-build-camel-40x.yml
+++ b/.github/workflows/pr-build-camel-40x.yml
@@ -72,3 +72,4 @@ jobs:
pr-id: ${{ github.event.number }}
github-token: ${{ secrets.GITHUB_TOKEN }}
skip-mvnd-install: 'true'
+ artifact-upload-suffix: java-${{ matrix.java }}
diff --git a/.github/workflows/pr-build-main.yml
b/.github/workflows/pr-build-main.yml
index b91af911c26..b06898a0a5f 100644
--- a/.github/workflows/pr-build-main.yml
+++ b/.github/workflows/pr-build-main.yml
@@ -79,3 +79,4 @@ jobs:
pr-id: ${{ github.event.number }}
github-token: ${{ secrets.GITHUB_TOKEN }}
skip-mvnd-install: 'true'
+ artifact-upload-suffix: java-${{ matrix.java }}
diff --git a/.github/workflows/pr-comment.yml b/.github/workflows/pr-comment.yml
index a1fbb7e743f..ebf383dc106 100644
--- a/.github/workflows/pr-comment.yml
+++ b/.github/workflows/pr-comment.yml
@@ -68,3 +68,4 @@ jobs:
pr-id: ${{ github.event.issue.number }}
comment-id: ${{ github.event.comment.id }}
comment-body: ${{ github.event.comment.body }}
+ artifact-upload-suffix: java-${{ matrix.java }}
