Skip to content
Merged
Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions .github/workflows/backport-prs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
const owner = context.repo.owner;
const repo = context.repo.repo;
const mergeCommitSha = context.payload.head_commit.id;
const assignees = ['matttrach', 'jiaqiluo', 'HarrisonWAffel'];

const { data: associatedPrs } = await github.rest.repos.listPullRequestsAssociatedWithCommit({
owner,
Expand Down Expand Up @@ -99,9 +100,9 @@ jobs:
head: newBranchName,
base: targetBranch,
body: "This pull request cherry-picks the changes from #" + pr.number + " into " + targetBranch + "\n" +
"Addresses #" + subIssueNumber + "for #" + mainIssue.number + " \n\n" +
"Addresses #" + subIssueNumber + " for #" + mainIssue.number + " \n\n" +
"**WARNING!**: to avoid having to resolve merge conflicts this PR is generated with `git cherry-pick -X theirs`.\n" +
"Please make sure to carefully inspect this PR so that you don't accidentally revert anything!",
assignees: ['terraform-maintainers']
assignees: assignees
});
}
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
const repo = context.repo.repo;
const owner = context.repo.owner;
const parentIssueBody = parentIssue.body;
const assignees = ['matttrach', 'jiaqiluo', 'HarrisonWAffel']
const assignees = ['matttrach', 'jiaqiluo', 'HarrisonWAffel'];

const prNumber = ${{ steps.extract_pr.outputs.result }};

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
if (releaseLabel) {
newLabels.push(releaseLabel);
}
const assignees = ['matttrach', 'jiaqiluo', 'HarrisonWAffel']
const assignees = ['matttrach', 'jiaqiluo', 'HarrisonWAffel'];

// Note: can't get terraform-maintainers team, the default token can't access org level objects
// Create the main issue
Expand Down