Skip to content

Change how the base branch is determined for the ci-report workflow #1681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2025
+19 −6
Merged

Change how the base branch is determined for the ci-report workflow #1681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions .github/workflows/ci-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,33 @@ jobs:
# that we publish with the one that we built the scan with in the first place:
- name: Determine the Branch Reference for which the original action was triggered
id: determine_branch_ref
env:
GH_TOKEN: ${{ github.token }}
run: |
echo '${{ toJSON(github.event.workflow_run.pull_requests) }}'
echo '${{ toJSON(github.event.workflow_run.event) }}'
if [ -n "${{ github.event.workflow_run.pull_requests[0].base.ref }}" ]; then
BRANCH_REF="${{ github.event.workflow_run.pull_requests[0].base.ref }}"
if [ "${{ github.event.workflow_run.event }}" == "pull_request" ]; then
echo "::notice::Triggering workflow was executed for a pull request"

FORK_OWNER="${{ github.event.workflow_run.head_repository.owner.login }}"
BRANCH_NAME="${{ github.event.workflow_run.head_branch }}"
if [ "${{ github.event.workflow_run.head_repository.owner.login }}" != "${{ github.event.workflow_run.repository.owner.login }}" ]; then
BRANCH_NAME="$FORK_OWNER:$BRANCH_NAME"
fi
TARGET_BRANCH=$(gh pr view "$BRANCH_NAME" --repo ${{ github.event.workflow_run.repository.full_name }} --json baseRefName -q .baseRefName)

echo "::notice::PR found. Target branch is: $TARGET_BRANCH"
echo "original_branch_ref=$TARGET_BRANCH" >> "$GITHUB_OUTPUT"
else
BRANCH_REF="${{ github.event.workflow_run.head_branch }}"
echo "::notice::Triggering workflow was executed for a push event? Using the head_branch value."
echo "original_branch_ref=${{ github.event.workflow_run.head_branch }}" >> "$GITHUB_OUTPUT"
fi
echo "original_branch_ref=$BRANCH_REF" >> "$GITHUB_OUTPUT"
# Checkout target branch which has trusted code
- name: Check out target branch
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # 4.2.2
with:
persist-credentials: false
# By default, a workflow that is triggered with on workflow_run would run on the main (default) branch.
# Different branches might have different versions of Develocity, and we want to make sure
# that we publish with the one that we built the scan with in the first place.
ref: ${{ steps.determine_branch_ref.outputs.original_branch_ref }}
- name: Set up Java 21
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # 4.7.1
Expand Down
Loading