Skip to content

Commit

Permalink
Merge pull request #648 from cdklabs/otaviom/disable-mergify
Browse files Browse the repository at this point in the history
chore: switch to merge queues
  • Loading branch information
mrgrain authored Oct 21, 2024
2 parents ea86adc + 85687b9 commit 1ad9f8f
Show file tree
Hide file tree
Showing 11 changed files with 60 additions and 56 deletions.
2 changes: 1 addition & 1 deletion .gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions .github/workflows/auto-queue.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .github/workflows/pull-request-lint.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions .mergify.yml

This file was deleted.

1 change: 0 additions & 1 deletion .npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ const project = new awscdk.AwsCdkTypeScriptApp({
devDeps: [
'@types/semver',
],
githubOptions: {
mergify: false,
mergeQueue: true,
},
});

project.synth();
4 changes: 2 additions & 2 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 26 additions & 26 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1ad9f8f

Please sign in to comment.