Skip to content

Commit e833741

Browse files
authored
Update GitHub Actions workflows. (#267)
This PR was automatically generated by the update-workflows-ecosysetem-providers.yml workflow in the pulumi/ci-mgmt repo, from d08fef048b7255d572f34670eec6c43c1c709553.
1 parent f2eebcf commit e833741

File tree

5 files changed

+59
-88
lines changed

5 files changed

+59
-88
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -176,34 +176,28 @@ jobs:
176176
177177
aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
178178
lint:
179-
container: golangci/golangci-lint:v1.54.1
180179
name: lint
181180
runs-on: ubuntu-latest
182181
steps:
183182
- name: Checkout Repo
184183
uses: actions/checkout@v3
185-
- name: Checkout Scripts Repo
186-
uses: actions/checkout@v3
187-
with:
188-
path: ci-scripts
189-
repository: pulumi/scripts
190-
- name: Mark repo as safe directory
191-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
192-
- name: Unshallow clone for tags
193-
run: git fetch --prune --unshallow --tags
194184
- name: Install Go
195185
uses: actions/setup-go@v4
196186
with:
197187
cache-dependency-path: |
198188
sdk/go.sum
199189
go-version: 1.21.x
200-
- name: Install pulumictl
201-
uses: jaxxstorm/action-install-gh-release@v1.5.0
202-
with:
203-
repo: pulumi/pulumictl
204-
- name: Install Pulumi CLI
205-
uses: pulumi/action-install-pulumi-cli@v2
206-
- run: make lint_provider
190+
- name: disarm go:embed directives to enable lint
191+
run: |
192+
git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g'
193+
- name: prepare upstream
194+
continue-on-error: true
195+
run: make upstream
196+
- name: golangci-lint
197+
uses: golangci/golangci-lint-action@v3
198+
with:
199+
version: v1.54.1
200+
working-directory: provider
207201
- if: failure() && github.event_name == 'push'
208202
name: Notify Slack
209203
uses: 8398a7/action-slack@v3

.github/workflows/master.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -176,34 +176,28 @@ jobs:
176176
177177
aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
178178
lint:
179-
container: golangci/golangci-lint:v1.54.1
180179
name: lint
181180
runs-on: ubuntu-latest
182181
steps:
183182
- name: Checkout Repo
184183
uses: actions/checkout@v3
185-
- name: Checkout Scripts Repo
186-
uses: actions/checkout@v3
187-
with:
188-
path: ci-scripts
189-
repository: pulumi/scripts
190-
- name: Mark repo as safe directory
191-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
192-
- name: Unshallow clone for tags
193-
run: git fetch --prune --unshallow --tags
194184
- name: Install Go
195185
uses: actions/setup-go@v4
196186
with:
197187
cache-dependency-path: |
198188
sdk/go.sum
199189
go-version: 1.21.x
200-
- name: Install pulumictl
201-
uses: jaxxstorm/action-install-gh-release@v1.5.0
202-
with:
203-
repo: pulumi/pulumictl
204-
- name: Install Pulumi CLI
205-
uses: pulumi/action-install-pulumi-cli@v2
206-
- run: make lint_provider
190+
- name: disarm go:embed directives to enable lint
191+
run: |
192+
git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g'
193+
- name: prepare upstream
194+
continue-on-error: true
195+
run: make upstream
196+
- name: golangci-lint
197+
uses: golangci/golangci-lint-action@v3
198+
with:
199+
version: v1.54.1
200+
working-directory: provider
207201
- if: failure() && github.event_name == 'push'
208202
name: Notify Slack
209203
uses: 8398a7/action-slack@v3

.github/workflows/prerelease.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,34 +123,28 @@ jobs:
123123
- go
124124
- java
125125
lint:
126-
container: golangci/golangci-lint:v1.54.1
127126
name: lint
128127
runs-on: ubuntu-latest
129128
steps:
130129
- name: Checkout Repo
131130
uses: actions/checkout@v3
132-
- name: Checkout Scripts Repo
133-
uses: actions/checkout@v3
134-
with:
135-
path: ci-scripts
136-
repository: pulumi/scripts
137-
- name: Mark repo as safe directory
138-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
139-
- name: Unshallow clone for tags
140-
run: git fetch --prune --unshallow --tags
141131
- name: Install Go
142132
uses: actions/setup-go@v4
143133
with:
144134
cache-dependency-path: |
145135
sdk/go.sum
146136
go-version: 1.21.x
147-
- name: Install pulumictl
148-
uses: jaxxstorm/action-install-gh-release@v1.5.0
149-
with:
150-
repo: pulumi/pulumictl
151-
- name: Install Pulumi CLI
152-
uses: pulumi/action-install-pulumi-cli@v2
153-
- run: make lint_provider
137+
- name: disarm go:embed directives to enable lint
138+
run: |
139+
git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g'
140+
- name: prepare upstream
141+
continue-on-error: true
142+
run: make upstream
143+
- name: golangci-lint
144+
uses: golangci/golangci-lint-action@v3
145+
with:
146+
version: v1.54.1
147+
working-directory: provider
154148
- if: failure() && github.event_name == 'push'
155149
name: Notify Slack
156150
uses: 8398a7/action-slack@v3

.github/workflows/release.yml

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -136,34 +136,28 @@ jobs:
136136
run: pulumictl create docs-build pulumi-${{ env.PROVIDER }}
137137
"${GITHUB_REF#refs/tags/}"
138138
lint:
139-
container: golangci/golangci-lint:v1.54.1
140139
name: lint
141140
runs-on: ubuntu-latest
142141
steps:
143142
- name: Checkout Repo
144143
uses: actions/checkout@v3
145-
- name: Checkout Scripts Repo
146-
uses: actions/checkout@v3
147-
with:
148-
path: ci-scripts
149-
repository: pulumi/scripts
150-
- name: Mark repo as safe directory
151-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
152-
- name: Unshallow clone for tags
153-
run: git fetch --prune --unshallow --tags
154144
- name: Install Go
155145
uses: actions/setup-go@v4
156146
with:
157147
cache-dependency-path: |
158148
sdk/go.sum
159149
go-version: 1.21.x
160-
- name: Install pulumictl
161-
uses: jaxxstorm/action-install-gh-release@v1.5.0
162-
with:
163-
repo: pulumi/pulumictl
164-
- name: Install Pulumi CLI
165-
uses: pulumi/action-install-pulumi-cli@v2
166-
- run: make lint_provider
150+
- name: disarm go:embed directives to enable lint
151+
run: |
152+
git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g'
153+
- name: prepare upstream
154+
continue-on-error: true
155+
run: make upstream
156+
- name: golangci-lint
157+
uses: golangci/golangci-lint-action@v3
158+
with:
159+
version: v1.54.1
160+
working-directory: provider
167161
- if: failure() && github.event_name == 'push'
168162
name: Notify Slack
169163
uses: 8398a7/action-slack@v3

.github/workflows/run-acceptance-tests.yml

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ jobs:
143143
repository: ${{ github.event.client_payload.github.payload.repository.full_name }}
144144
token: ${{ secrets.PULUMI_BOT_TOKEN }}
145145
lint:
146-
container: golangci/golangci-lint:v1.54.1
147146
if: github.event_name == 'repository_dispatch' ||
148147
github.event.pull_request.head.repo.full_name == github.repository
149148
name: lint
@@ -153,28 +152,24 @@ jobs:
153152
uses: actions/checkout@v3
154153
with:
155154
ref: ${{ env.PR_COMMIT_SHA }}
156-
- name: Checkout Scripts Repo
157-
uses: actions/checkout@v3
158-
with:
159-
path: ci-scripts
160-
repository: pulumi/scripts
161-
- name: Mark repo as safe directory
162-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
163-
- name: Unshallow clone for tags
164-
run: git fetch --prune --unshallow --tags
165-
- name: Install Go
155+
- name: disarm go:embed directives to enable lint
156+
run: |
157+
git grep -l 'go:embed' -- provider | xargs sed -i 's/go:embed/ goembed/g'
158+
- name: prepare upstream
159+
continue-on-error: true
160+
run: make upstream
161+
- name: Install go
166162
uses: actions/setup-go@v4
167163
with:
168-
cache-dependency-path: |
169-
sdk/go.sum
170-
go-version: 1.21.x
171-
- name: Install pulumictl
172-
uses: jaxxstorm/action-install-gh-release@v1.5.0
164+
# The versions of golangci-lint and setup-go here cross-depend and need to update together.
165+
go-version: 1.21
166+
# Either this action or golangci-lint needs to disable the cache
167+
cache: false
168+
- name: golangci-lint
169+
uses: golangci/golangci-lint-action@v3
173170
with:
174-
repo: pulumi/pulumictl
175-
- name: Install Pulumi CLI
176-
uses: pulumi/action-install-pulumi-cli@v2
177-
- run: make lint_provider
171+
version: v1.54.1
172+
working-directory: provider
178173
- if: failure() && github.event_name == 'push'
179174
name: Notify Slack
180175
uses: 8398a7/action-slack@v3

0 commit comments

Comments
 (0)