Skip to content

Commit 23cf25a

Browse files
authored
Simplify upmerge workflow to single job with dynamic matrix (#135)
Remove the duplicated `upmerge-custom` job and `workflow_dispatch` custom inputs. One job with a simple matrix, `workflow_dispatch` kept for manual trigger without custom branch selection.
2 parents 4be472a + cd86bcf commit 23cf25a

File tree

1 file changed

+3
-33
lines changed

1 file changed

+3
-33
lines changed

.github/workflows/upmerge_pr.yaml

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,16 @@ on:
44
schedule:
55
-
66
cron: "0 2 * * *"
7-
workflow_dispatch:
8-
inputs:
9-
base_branch:
10-
description: "Source branch (leave empty for default matrix)"
11-
required: false
12-
type: string
13-
target_branch:
14-
description: "Target branch (leave empty for default matrix)"
15-
required: false
16-
type: string
7+
workflow_dispatch: ~
178

189
permissions:
1910
contents: write
2011
pull-requests: write
2112

2213
jobs:
23-
# Scheduled runs or manual without inputs - use matrix
24-
upmerge-matrix:
25-
if: github.repository == 'Sylius/CmsPlugin' && !inputs.base_branch
14+
upmerge:
2615
runs-on: ubuntu-latest
16+
if: github.repository == 'Sylius/CmsPlugin'
2717
name: "Upmerge PR"
2818
timeout-minutes: 5
2919
strategy:
@@ -46,23 +36,3 @@ jobs:
4636
base_branch: ${{ matrix.base_branch }}
4737
target_branch: ${{ matrix.target_branch }}
4838
token: ${{ secrets.SYLIUS_BOT_PAT }}
49-
50-
# Manual with custom inputs
51-
upmerge-custom:
52-
if: github.repository == 'Sylius/CmsPlugin' && inputs.base_branch
53-
runs-on: ubuntu-latest
54-
name: "Upmerge PR (${{ inputs.base_branch }} -> ${{ inputs.target_branch }})"
55-
timeout-minutes: 5
56-
57-
steps:
58-
-
59-
uses: actions/checkout@v4
60-
with:
61-
ref: ${{ inputs.target_branch }}
62-
63-
-
64-
uses: SyliusLabs/UpmergeAction@v1
65-
with:
66-
base_branch: ${{ inputs.base_branch }}
67-
target_branch: ${{ inputs.target_branch }}
68-
token: ${{ secrets.SYLIUS_BOT_PAT }}

0 commit comments

Comments
 (0)