Skip to content

Commit 2ed6257

Browse files
committed
[WFLY-19889] Propagate the actual merge commit to cloud-tests
1 parent 48d1dda commit 2ed6257

File tree

2 files changed

+4
-15
lines changed

2 files changed

+4
-15
lines changed

.github/workflows/cloud-test-pr-trigger.yml

+3-14
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,9 @@ jobs:
3838
- name: Get pull request number
3939
run: |
4040
event_name="${{ github.event_name }}"
41-
42-
if [ "${event_name}" == "pull_request" ]; then
43-
echo "This is a pull request"
44-
echo "PR_NUMBER=${{ github.event.number }}" >> .job-env
45-
echo "GITHUB_SHA_FOR_PR=${{ github.sha }}" >> .job-env
46-
echo "GITHUB_EVENT_PULL_REQUEST_HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> .job-env
47-
elif [ "${event_name}" == "push" ]; then
48-
echo "This is a push"
49-
echo "PR_NUMBER=push" >> .job-env
50-
echo "GITHUB_SHA=${{ github.sha }}" >> .job-env
51-
else
52-
echo "The ${event_name} event is not handled by this workflow"
53-
exit 1
54-
fi
41+
echo "PR_NUMBER=${{ github.event.number }}" >> .job-env
42+
echo "GITHUB_SHA_FOR_PR=${{ github.sha }}" >> .job-env
43+
echo "GITHUB_EVENT_PULL_REQUEST_HEAD_SHA=${{ github.event.pull_request.head.sha }}" >> .job-env
5544
cat .job-env
5645
- uses: actions/upload-artifact@v4
5746
with:

.github/workflows/cloud-test-pr-workflow-run.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
CLIENT_PAYLOAD=$( jq -n \
9797
--arg tr "$GITHUB_REPOSITORY" \
98-
--arg githubSha "$GITHUB_EVENT_PULL_REQUEST_HEAD_SHA" \
98+
--arg githubSha "$GITHUB_SHA_FOR_PR" \
9999
--arg prHeadSha "$GITHUB_EVENT_PULL_REQUEST_HEAD_SHA" \
100100
--arg pr "$PR_NUMBER" \
101101
'{triggerRepo: $tr, githubSha: $githubSha, prHeadSha: $prHeadSha, pr: $pr}' )

0 commit comments

Comments
 (0)