Skip to content

Commit 7104d32

Browse files
authored
Merge pull request #22 from HsiehShuJeng/github-actions/upgrade-dependencies
chore(deps): upgrade-dependencies
2 parents 8f4dc8e + a7d4287 commit 7104d32

File tree

6 files changed

+24
-105
lines changed

6 files changed

+24
-105
lines changed

.gitattributes

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ yarn-error.log*
5959
!/.github/workflows/release.yml
6060
!/.github/workflows/upgrade-dependencies.yml
6161
!/.github/workflows/upgrade-projen.yml
62-
!/.mergify.yml
6362
!/.npmignore
6463
!/.projen/deps.json
6564
!/.projen/tasks.json

.mergify.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.projenrc.js

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -108,49 +108,6 @@ project.eslint.addOverride({
108108
rules: { '@typescript-eslint/no-require-imports': 0 },
109109
});
110110

111-
const mergifyRules = [
112-
{
113-
name: 'Automatic merge on approval and successful build',
114-
actions: {
115-
merge: {
116-
method: 'squash',
117-
commit_message: 'title+body',
118-
strict: 'smart',
119-
strict_method: 'merge',
120-
},
121-
delete_head_branch: {},
122-
},
123-
conditions: [
124-
'#approved-reviews-by>=1',
125-
'status-success=build',
126-
'-title~=(WIP|wip)',
127-
'-label~=(blocked|do-not-merge)',
128-
],
129-
},
130-
{
131-
name: 'Automatic merge PRs with auto-merge label upon successful build',
132-
actions: {
133-
merge: {
134-
method: 'squash',
135-
commit_message: 'title+body',
136-
strict: 'smart',
137-
strict_method: 'merge',
138-
},
139-
delete_head_branch: {},
140-
},
141-
conditions: [
142-
'label=auto-merge',
143-
'status-success=build',
144-
'-title~=(WIP|wip)',
145-
'-label~=(blocked|do-not-merge)',
146-
],
147-
},
148-
];
149-
150-
new Mergify(project.github, {
151-
rules: mergifyRules,
152-
});
153-
154111
const commonExclusions = ['cdk.context.json', 'yarn-error.log'];
155112
project.npmignore.exclude(...commonExclusions);
156113
project.gitignore.exclude(...commonExclusions);

package.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

yarn.lock

Lines changed: 21 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)