Skip to content

Commit 3a99907

Browse files
committed
[internal] Update GitHub Actions workflow files
1 parent a0c3cca commit 3a99907

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/lint.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,8 @@ jobs:
5050
- name: prepare workspace
5151
continue-on-error: true
5252
run: make prepare_local_workspace
53-
54-
# TODO[pulumi/ci-mgmt#1622] unfortunate workaround for mysterious lint failure
55-
#
56-
# - name: golangci-lint
57-
# uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
58-
# with:
59-
# version: v1.64.6
60-
# working-directory: provider
53+
- name: golangci-lint
54+
uses: golangci/golangci-lint-action@55c2c1448f86e01eaae002a5a3a9624417608d84 # v6
55+
with:
56+
version: v1.64.6
57+
working-directory: provider

.github/workflows/upgrade-java.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ permissions:
2323
pull-requests: write
2424

2525
env:
26+
27+
# upgrade-provider calls into gh CLI tool to open PRs that uses GH_TOKEN env var, which is not obivous.
28+
# setting this correctly makes sure the PR has the correct owner and permissions work as expected.
29+
GH_TOKEN: ${{ secrets.PULUMI_PROVIDER_AUTOMATION_TOKEN || secrets.PULUMI_BOT_TOKEN || secrets.GITHUB_TOKEN }}
30+
2631
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2732

2833
jobs:
@@ -58,5 +63,6 @@ jobs:
5863
env:
5964
V: ${{inputs.version}}
6065
REPO: ${{github.repository}}
66+
GH_TOKEN: ${{env.GH_TOKEN}}
6167
run: |
6268
upgrade-provider "$REPO" --kind=java --java-version="$V"

0 commit comments

Comments
 (0)