From 34cfbf6e5831a3a9fbe2e3da5bd7caab3924c061 Mon Sep 17 00:00:00 2001 From: Christoph Jerolimov Date: Mon, 20 Jul 2026 11:48:31 +0200 Subject: [PATCH 1/3] ci: run verify plugin export workflow on pull requests Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/verify-plugin-export.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/verify-plugin-export.yaml b/.github/workflows/verify-plugin-export.yaml index 4e62f35..3ca4ff2 100644 --- a/.github/workflows/verify-plugin-export.yaml +++ b/.github/workflows/verify-plugin-export.yaml @@ -1,6 +1,7 @@ name: Verify Plugin Export on: + pull_request: schedule: - cron: '17 3 * * *' workflow_dispatch: From d8652e13c83cf41f47195d2f3a740120e3a0e552 Mon Sep 17 00:00:00 2001 From: Christoph Jerolimov Date: Mon, 20 Jul 2026 11:52:44 +0200 Subject: [PATCH 2/3] fix(ci): fix checkout ref for pull_request events Use empty string fallback for rhdh-cli checkouts so actions/checkout uses its default behavior (PR merge commit for PRs, default branch for schedule). Use 'main' fallback for the overlays repo checkout. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/verify-plugin-export.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/verify-plugin-export.yaml b/.github/workflows/verify-plugin-export.yaml index 3ca4ff2..8128b81 100644 --- a/.github/workflows/verify-plugin-export.yaml +++ b/.github/workflows/verify-plugin-export.yaml @@ -29,7 +29,7 @@ jobs: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: - ref: ${{ inputs.branch || github.ref_name }} + ref: ${{ inputs.branch || '' }} - name: Set up Node uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 @@ -76,7 +76,7 @@ jobs: - name: Checkout rhdh-cli uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: - ref: ${{ inputs.branch || github.ref_name }} + ref: ${{ inputs.branch || '' }} path: rhdh-cli - name: Set up Node @@ -101,7 +101,7 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: repository: redhat-developer/rhdh-plugin-export-overlays - ref: ${{ inputs.branch || github.ref_name }} + ref: ${{ inputs.branch || 'main' }} path: overlays - name: Clone source repo and run exports From 380628d05567f3d84417d2d4c358b577bce32261 Mon Sep 17 00:00:00 2001 From: Christoph Jerolimov Date: Mon, 20 Jul 2026 12:10:17 +0200 Subject: [PATCH 3/3] fix(ci): use PR target branch for overlays checkout Use github.base_ref for PRs so the overlays repo checks out the matching target branch (e.g. release-1.10) instead of always main. Co-Authored-By: Claude Opus 4.6 (1M context) --- .github/workflows/verify-plugin-export.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/verify-plugin-export.yaml b/.github/workflows/verify-plugin-export.yaml index 8128b81..4de74e0 100644 --- a/.github/workflows/verify-plugin-export.yaml +++ b/.github/workflows/verify-plugin-export.yaml @@ -101,7 +101,10 @@ jobs: uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 with: repository: redhat-developer/rhdh-plugin-export-overlays - ref: ${{ inputs.branch || 'main' }} + # For manual dispatched runs, use the input variable. + # For PRs, github.base_ref is the target branch (e.g. main or release-1.10). + # For schedule jobs where base_ref is empty, it falls back to github.ref_name. + ref: ${{ inputs.branch || github.base_ref || github.ref_name }} path: overlays - name: Clone source repo and run exports