[internal] Update GitHub Actions workflow files (#128)

pulumi · Mar 25, 2022 · 82d57b2 · 82d57b2
1 parent b004b22
commit 82d57b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 41 deletions.
diff --git a/.github/workflows/pr-automation.yml b/.github/workflows/pr-automation.yml
diff --git a/.github/workflows/update-bridge.yml b/.github/workflows/update-bridge.yml
@@ -45,7 +45,8 @@ jobs:
         }} && go mod tidy
     - run: make tfgen
     - run: make build_sdks
-    - name: Create PR
+    - id: create-pr
+      name: Create PR
       uses: peter-evans/create-pull-request@v3.12.0
       with:
         author: pulumi-bot <bot@pulumi.com>
@@ -61,6 +62,14 @@ jobs:
         title: Update pulumi-terraform-bridge to v${{ github.event.inputs.bridge_version
           }}
         token: ${{ secrets.PULUMI_BOT_TOKEN }}
+    - if: steps.create-pr.outputs.pull-request-operation == 'created'
+      name: Set Automerge
+      uses: peter-evans/enable-pull-request-automerge@v1
+      with:
+        github_token: ${{ secrets.PULUMI_BOT_TOKEN }}
+        merge_method: squash
+        pull_request_number: ${{ steps.create-pr.outputs.pull-request-number }}
+        repository: ${{ github.repository }}
     strategy:
       fail-fast: true
       matrix:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -33,9 +33,9 @@ changelog:
     exclude:
     - Merge branch
     - Merge pull request
-    - '[internal]'
-    - '[ci]'
-    - '[chore]'
+    - \Winternal\W
+    - \Wci\W
+    - \Wchore\W
   sort: asc
   use: git
 release: