Skip to content

Commit 7f8c07e

Browse files
authored
chore: only automerge PRs targeting main (#333)
Hopefully this should allow us to automerge a sequence of stacked PRs. --- By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license
1 parent 5bf7624 commit 7f8c07e

File tree

5 files changed

+33
-2
lines changed

5 files changed

+33
-2
lines changed

.github/workflows/auto-queue.yml

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.projenrc.ts

+7
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,13 @@ const repoProject = new yarn.Monorepo({
231231
githubOptions: {
232232
mergify: false,
233233
mergeQueue: true,
234+
mergeQueueOptions: {
235+
autoQueueOptions: {
236+
// Only autoqueue for PRs targeting the 'main' branch
237+
targetBranches: ['main'],
238+
},
239+
},
240+
pullRequestLint: true,
234241
pullRequestLintOptions: {
235242
contributorStatement: 'By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license',
236243
contributorStatementOptions: {

package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/toolkit-lib/package.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

yarn.lock

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)