From 686ddc06290f180a872de003982720696cce073d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20M=C3=A1rquez=20P=C3=A9rez?= Date: Thu, 16 Nov 2023 15:13:30 +0000 Subject: [PATCH 1/2] fix(projen): change mergify configuration property The configuration was incorreccly named and it caused errors when Mergify execute their jobs ISSUES CLOSED: 5 --- .mergify.yml | 4 ++-- .projenrc.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 824b595..6c99b60 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -29,7 +29,7 @@ pull_request_rules: label: add: - upgraded - delete_head_branches: {} + delete_head_branch: {} queue: method: squash name: default @@ -40,7 +40,7 @@ pull_request_rules: - status-success=package-js - name: Automatatic merge with review label actions: - delete_head_branches: {} + delete_head_branch: {} queue: method: squash name: default diff --git a/.projenrc.ts b/.projenrc.ts index 06fc691..ffb3607 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -73,7 +73,7 @@ project.github?.mergify?.addRule({ label: { add: ['upgraded'], }, - ['delete_head_branches']: {}, + ['delete_head_branch']: {}, queue: { method: 'squash', name: 'default', @@ -90,7 +90,7 @@ project.github?.mergify?.addRule({ project.github?.mergify?.addRule({ name: 'Automatatic merge with review label', actions: { - ['delete_head_branches']: {}, + ['delete_head_branch']: {}, queue: { method: 'squash', name: 'default', From 4e60a16d1db8c1c9686f379de7a85528c1339c22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20M=C3=A1rquez=20P=C3=A9rez?= Date: Thu, 16 Nov 2023 15:18:29 +0000 Subject: [PATCH 2/2] fix(projen): remove mergify configuration property we remoge delete branches property, it is shown an error in mergify ISSUES CLOSED: 5 --- .mergify.yml | 4 +--- .projenrc.ts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 6c99b60..ba3c08e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -29,7 +29,6 @@ pull_request_rules: label: add: - upgraded - delete_head_branch: {} queue: method: squash name: default @@ -38,9 +37,8 @@ pull_request_rules: - -label~=(do-not-merge) - status-success=build - status-success=package-js - - name: Automatatic merge with review label + - name: Automatic merge with review label actions: - delete_head_branch: {} queue: method: squash name: default diff --git a/.projenrc.ts b/.projenrc.ts index ffb3607..0e70d28 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -73,7 +73,6 @@ project.github?.mergify?.addRule({ label: { add: ['upgraded'], }, - ['delete_head_branch']: {}, queue: { method: 'squash', name: 'default', @@ -88,9 +87,8 @@ project.github?.mergify?.addRule({ }); project.github?.mergify?.addRule({ - name: 'Automatatic merge with review label', + name: 'Automatic merge with review label', actions: { - ['delete_head_branch']: {}, queue: { method: 'squash', name: 'default',