chore: fix minor workflow issues

cdktf · Aug 24, 2023 · a808d03 · a808d03
1 parent 311b177
commit a808d03
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 8 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/.github/workflows/upgrade-cdktf.yml b/.github/workflows/upgrade-cdktf.yml
diff --git a/projenrc/auto-approve.ts b/projenrc/auto-approve.ts
@@ -24,7 +24,7 @@ export class AutoApprove {
     workflow.addJobs({
       approve: {
         runsOn: ["ubuntu-latest"],
-        if: "contains(github.event.pull_request.labels.*.name, 'auto-approve')",
+        if: "contains(github.event.pull_request.labels.*.name, 'auto-approve') && github.event.pull_request.draft == false",
         steps: [
           {
             name: "Checkout PR",

diff --git a/projenrc/automerge.ts b/projenrc/automerge.ts
@@ -32,7 +32,7 @@ export class AutoMerge {
     workflow.addJobs({
       automerge: {
         runsOn: ["ubuntu-latest"],
-        if: "contains(github.event.pull_request.labels.*.name, 'automerge')",
+        if: "contains(github.event.pull_request.labels.*.name, 'automerge') && github.event.pull_request.draft == false",
         steps: [
           {
             name: "Checkout",

diff --git a/projenrc/upgrade-cdktf.ts b/projenrc/upgrade-cdktf.ts
@@ -80,9 +80,8 @@ export class UpgradeCDKTF {
                 "Unfortunately, not everything can be automated, and the following steps need to be completed manually:",
                 " ",
                 "- [ ] Update `@cdktf/provider-tfe` to a version compatible with `cdktf@${{ steps.latest_version.outputs.value }}` [here](https://github.com/cdktf/cdktf-multi-stack-tfe/blob/d354d32382b3aa20cdc28c332131d04b730623c0/.projenrc.ts#L36)",
-                "- [ ] Run `npx projen` again",
                 " ",
-                "Please checkout this PR, complete the above steps, push the changes to this PR, and then mark this PR as ready for review to complete the upgrade. Thanks!",
+                "Please checkout this PR, complete the above steps, push the changes to this branch, and then mark this PR as ready for review to complete the upgrade. Thanks!",
               ].join("\n"),
               labels: "automerge,auto-approve,dependencies",
               token: "${{ secrets.PROJEN_GITHUB_TOKEN }}",