Skip to content

Determine and checkout the original target branch when publishing the build scans #1673

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
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
13 changes: 12 additions & 1 deletion .github/workflows/ci-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,23 @@ jobs:
if: github.repository == 'hibernate/hibernate-validator' && github.event.workflow_run.conclusion != 'cancelled'
runs-on: ubuntu-latest
steps:
# 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:
- name: Determine the Branch Reference for which the original action was triggered
id: determine_branch_ref
run: |
if [ -n "${{ github.event.workflow_run.pull_requests[0].base.ref }}" ]; then
BRANCH_REF="${{ github.event.workflow_run.pull_requests[0].base.ref }}"
else
BRANCH_REF="${{ github.event.workflow_run.head_branch }}"
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
ref: ${{ github.ref }}
ref: ${{ steps.determine_branch_ref.outputs.original_branch_ref }}
- name: Set up Java 21
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # 4.7.1
with:
Expand Down
Loading