chore: fix automerge and auto-approve workflows

cdktf · Aug 24, 2023 · c6cae40 · c6cae40
1 parent 89bdf6a
commit c6cae40
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
diff --git a/projenrc/auto-approve.ts b/projenrc/auto-approve.ts
@@ -16,7 +16,7 @@ export class AutoApprove {
     if (!workflow) throw new Error("no workflow defined");
 
     workflow.on({
-      pullRequestTarget: {
+      pullRequest: {
         types: ["opened", "labeled", "ready_for_review", "reopened"],
       },
     });

diff --git a/projenrc/automerge.ts b/projenrc/automerge.ts
@@ -16,7 +16,7 @@ export class AutoMerge {
     if (!workflow) throw new Error("no workflow defined");
 
     workflow.on({
-      pullRequestTarget: {
+      pullRequest: {
         types: [
           "opened",
           "labeled",
@@ -32,6 +32,7 @@ export class AutoMerge {
     workflow.addJobs({
       automerge: {
         runsOn: ["ubuntu-latest"],
+        if: "contains(github.event.pull_request.labels.*.name, 'automerge')",
         steps: [
           {
             name: "Checkout",