Skip to content

Commit 05ffe85

Browse files
authored
[internal] Update GitHub Actions workflow files (#148)
1 parent 24127e7 commit 05ffe85

File tree

4 files changed

+15
-43
lines changed

4 files changed

+15
-43
lines changed

.github/workflows/pr-automation.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ jobs:
405405
with:
406406
repo: pulumi/pulumictl
407407
- name: Add SDK version tag
408-
run: git tag sdk/$(pulumictl get version --language generic) && git push origin
409-
sdk/$(pulumictl get version --language generic)
408+
run: git tag sdk/v$(pulumictl get version --language generic) && git push origin
409+
sdk/v$(pulumictl get version --language generic)
410410
test:
411411
name: test
412412
needs: build_sdk

.github/workflows/update-bridge.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545
}} && go mod tidy
4646
- run: make tfgen
4747
- run: make build_sdks
48-
- name: Create PR
48+
- id: create-pr
49+
name: Create PR
4950
uses: peter-evans/create-pull-request@v3.12.0
5051
with:
5152
author: pulumi-bot <bot@pulumi.com>
@@ -61,6 +62,14 @@ jobs:
6162
title: Update pulumi-terraform-bridge to v${{ github.event.inputs.bridge_version
6263
}}
6364
token: ${{ secrets.PULUMI_BOT_TOKEN }}
65+
- if: steps.create-pr.outputs.pull-request-operation == 'created'
66+
name: Set Automerge
67+
uses: peter-evans/enable-pull-request-automerge@v1
68+
with:
69+
github_token: ${{ secrets.PULUMI_BOT_TOKEN }}
70+
merge_method: squash
71+
pull_request_number: ${{ steps.create-pr.outputs.pull-request-number }}
72+
repository: ${{ github.repository }}
6473
strategy:
6574
fail-fast: true
6675
matrix:

.goreleaser.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ changelog:
3333
exclude:
3434
- Merge branch
3535
- Merge pull request
36-
- '[internal]'
37-
- '[ci]'
38-
- '[chore]'
36+
- \Winternal\W
37+
- \Wci\W
38+
- \Wchore\W
3939
sort: asc
4040
use: git
4141
release:

0 commit comments

Comments
 (0)