Skip to content
This repository was archived by the owner on Mar 6, 2024. It is now read-only.

Commit b1ad1d5

Browse files
authored
fix combine prs workflow (#152)
1 parent 680cdba commit b1ad1d5

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

.github/workflows/combine-prs.yml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
name: "Combine PRs"
1+
name: 'Combine PRs'
22

33
# Controls when the action will run - in this case triggered manually
44
on:
55
workflow_dispatch:
66
inputs:
77
branchPrefix:
8-
description: "Branch prefix to find combinable PRs based on"
8+
description: 'Branch prefix to find combinable PRs based on'
99
required: true
10-
default: "dependabot"
10+
default: 'dependabot'
1111
mustBeGreen:
12-
description: "Only combine PRs that are green (status is success)"
12+
description: 'Only combine PRs that are green (status is success)'
1313
required: true
14-
default: "true"
14+
default: 'true'
1515
combineBranchName:
16-
description: "Name of the branch to combine PRs into"
16+
description: 'Name of the branch to combine PRs into'
1717
required: true
18-
default: "combine-prs-branch"
18+
default: 'combine-prs-branch'
1919
ignoreLabel:
20-
description: "Exclude PRs with this label"
20+
description: 'Exclude PRs with this label'
2121
required: true
22-
default: "nocombine"
22+
default: 'nocombine'
2323

2424
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
2525
jobs:
@@ -53,7 +53,7 @@ jobs:
5353
repo: context.repo.repo
5454
});
5555
56-
group_labels = ["go", "python", "terraform"];
56+
group_labels = ["javascript"];
5757
branches = {};
5858
5959
base_branch = null;
@@ -118,9 +118,7 @@ jobs:
118118
}
119119
120120
core.setOutput('base-branch', base_branch);
121-
core.setOutput('branches-go', (branches["go"] || []).join(' '));
122-
core.setOutput('branches-python', (branches["python"] || []).join(' '));
123-
core.setOutput('branches-terraform', (branches["terraform"] || []).join(' '));
121+
core.setOutput('branches-js', (branches["javascript"] || []).join(' '));
124122
125123
return "ok"
126124
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
@@ -131,12 +129,8 @@ jobs:
131129
- name: Created combined branch and PR
132130
env:
133131
BASE_BRANCH: ${{ steps.fetch-branch-names.outputs.base-branch }}
134-
BRANCHES_1: ${{ steps.fetch-branch-names.outputs.branches-go }}
135-
BRANCHES_2: ${{ steps.fetch-branch-names.outputs.branches-python }}
136-
BRANCHES_3: ${{ steps.fetch-branch-names.outputs.branches-terraform }}
137-
COMBINE_NAME_1: ${{ env.COMBINE_BRANCH_NAME }}-go
138-
COMBINE_NAME_2: ${{ env.COMBINE_BRANCH_NAME }}-python
139-
COMBINE_NAME_3: ${{ env.COMBINE_BRANCH_NAME }}-terraform
132+
BRANCHES_1: ${{ steps.fetch-branch-names.outputs.branches-js }}
133+
COMBINE_NAME_1: ${{ env.COMBINE_BRANCH_NAME }}-js
140134
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
141135
run: |
142136
set -x

0 commit comments

Comments
 (0)