diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index 7ac64f6..97990d8 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -14,7 +14,7 @@ jobs: permissions: contents: read pull-requests: write - 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 uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 2aaee17..fdf5494 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest permissions: contents: read - 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 uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 diff --git a/.github/workflows/upgrade-cdktf.yml b/.github/workflows/upgrade-cdktf.yml index b9bc072..39ca041 100644 --- a/.github/workflows/upgrade-cdktf.yml +++ b/.github/workflows/upgrade-cdktf.yml @@ -50,9 +50,8 @@ jobs: 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! labels: automerge,auto-approve,dependencies token: ${{ secrets.PROJEN_GITHUB_TOKEN }} author: team-tf-cdk diff --git a/projenrc/auto-approve.ts b/projenrc/auto-approve.ts index 0644b5d..89591a7 100644 --- 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 index c3e0477..c1ccd60 100644 --- 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 index a8da1ba..60f7eac 100644 --- 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 }}",