Skip to content

Commit a62e744

Browse files
authored
[internal] Update GitHub Actions workflow files (#373)
1 parent 7b3a6d7 commit a62e744

File tree

11 files changed

+152
-161
lines changed

11 files changed

+152
-161
lines changed

.github/workflows/command-dispatch.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
22

33
env:
4+
PROVIDER: github
45
DOTNETVERSION: |
5-
6.0.x
6-
3.1.301
6+
6.0.x
7+
3.1.301
78
GH_ORGANIZATION: ${{ secrets.GH_ORGANIZATION }}
89
GH_TESTING_TOKEN: ${{ secrets.GH_TESTING_TOKEN }}
910
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1011
GOVERSION: 1.20.1
1112
JAVAVERSION: "11"
12-
NODEVERSION: 16.x
1313
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
NODEVERSION: 16.x
1415
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1516
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
16-
PROVIDER: github
1717
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
1818
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
1919
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}

.github/workflows/main.yml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
22

33
env:
4+
PROVIDER: github
45
DOTNETVERSION: |
5-
6.0.x
6-
3.1.301
6+
6.0.x
7+
3.1.301
78
GH_ORGANIZATION: ${{ secrets.GH_ORGANIZATION }}
89
GH_TESTING_TOKEN: ${{ secrets.GH_TESTING_TOKEN }}
910
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1011
GOVERSION: 1.20.1
1112
JAVAVERSION: "11"
12-
NODEVERSION: 16.x
1313
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
NODEVERSION: 16.x
1415
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1516
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
16-
PROVIDER: github
1717
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
1818
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
1919
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
@@ -90,10 +90,10 @@ jobs:
9090
- name: Install plugins
9191
run: make install_plugins
9292
- name: Update path
93-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
93+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
9494
- name: Set PACKAGE_VERSION to Env
9595
run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >>
96-
$GITHUB_ENV
96+
"$GITHUB_ENV"
9797
- name: Build SDK
9898
run: make build_${{ matrix.language }}
9999
- name: Check worktree clean
@@ -167,11 +167,11 @@ jobs:
167167
run: cat ${{ env.COVERAGE_OUTPUT_DIR }}/shortSummary.txt
168168
- name: Upload coverage data to S3
169169
run: >-
170-
summaryName="${PROVIDER}_summary_`date +"%Y-%m-%d_%H-%M-%S"`.json"
170+
summaryName="${PROVIDER}_summary_$(date +"%Y-%m-%d_%H-%M-%S").json"
171171
172172
s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}"
173173
174-
aws s3 cp ${{ env.COVERAGE_OUTPUT_DIR }}/summary.json ${s3FullURI} --acl bucket-owner-full-control
174+
aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
175175
lint:
176176
container: golangci/golangci-lint:v1.51
177177
name: lint
@@ -185,8 +185,7 @@ jobs:
185185
path: ci-scripts
186186
repository: pulumi/scripts
187187
- name: Mark repo as safe directory
188-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
189-
}}/pulumi-${{ env.PROVIDER }}
188+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
190189
- name: Unshallow clone for tags
191190
run: git fetch --prune --unshallow --tags
192191
- name: Install Go
@@ -221,8 +220,7 @@ jobs:
221220
path: ci-scripts
222221
repository: pulumi/scripts
223222
- name: Mark repo as safe directory
224-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
225-
}}/pulumi-${{ env.PROVIDER }}
223+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
226224
- name: Unshallow clone for tags
227225
run: git fetch --prune --unshallow --tags
228226
- name: Install Go
@@ -275,12 +273,13 @@ jobs:
275273
run: make provider
276274
- if: github.event_name == 'pull_request'
277275
name: Check Schema is Valid
278-
run: >-
279-
echo 'SCHEMA_CHANGES<<EOF' >> $GITHUB_ENV
280-
281-
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
282-
283-
echo 'EOF' >> $GITHUB_ENV
276+
run: |
277+
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
278+
{
279+
echo "SCHEMA_CHANGES<<$EOF";
280+
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json;
281+
echo "$EOF";
282+
} >> "$GITHUB_ENV"
284283
- if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]'
285284
name: Comment on PR with Details of Schema Check
286285
uses: thollander/actions-comment-pull-request@v2
@@ -342,8 +341,7 @@ jobs:
342341
role-session-name: ${{ env.PROVIDER }}@githubActions
343342
role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }}
344343
- name: Set PreRelease Version
345-
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)"
346-
>> $GITHUB_ENV
344+
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV"
347345
- name: Run GoReleaser
348346
uses: goreleaser/goreleaser-action@v2
349347
with:
@@ -363,7 +361,7 @@ jobs:
363361
runs-on: ubuntu-latest
364362
steps:
365363
- name: Publish SDKs
366-
uses: pulumi/[email protected].6
364+
uses: pulumi/[email protected].7
367365
- env:
368366
SLACK_CHANNEL: provider-upgrade-publish-status
369367
SLACK_COLOR: "#FF0000"
@@ -446,7 +444,7 @@ jobs:
446444
run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{
447445
github.workspace }}/sdk/${{ matrix.language }}
448446
- name: Update path
449-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
447+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
450448
- name: Install Python deps
451449
run: |-
452450
pip3 install virtualenv==20.0.23

.github/workflows/master.yml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
22

33
env:
4+
PROVIDER: github
45
DOTNETVERSION: |
5-
6.0.x
6-
3.1.301
6+
6.0.x
7+
3.1.301
78
GH_ORGANIZATION: ${{ secrets.GH_ORGANIZATION }}
89
GH_TESTING_TOKEN: ${{ secrets.GH_TESTING_TOKEN }}
910
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1011
GOVERSION: 1.20.1
1112
JAVAVERSION: "11"
12-
NODEVERSION: 16.x
1313
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
NODEVERSION: 16.x
1415
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1516
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
16-
PROVIDER: github
1717
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
1818
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
1919
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
@@ -90,10 +90,10 @@ jobs:
9090
- name: Install plugins
9191
run: make install_plugins
9292
- name: Update path
93-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
93+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
9494
- name: Set PACKAGE_VERSION to Env
9595
run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >>
96-
$GITHUB_ENV
96+
"$GITHUB_ENV"
9797
- name: Build SDK
9898
run: make build_${{ matrix.language }}
9999
- name: Check worktree clean
@@ -167,11 +167,11 @@ jobs:
167167
run: cat ${{ env.COVERAGE_OUTPUT_DIR }}/shortSummary.txt
168168
- name: Upload coverage data to S3
169169
run: >-
170-
summaryName="${PROVIDER}_summary_`date +"%Y-%m-%d_%H-%M-%S"`.json"
170+
summaryName="${PROVIDER}_summary_$(date +"%Y-%m-%d_%H-%M-%S").json"
171171
172172
s3FullURI="s3://${{ secrets.S3_COVERAGE_BUCKET_NAME }}/summaries/${summaryName}"
173173
174-
aws s3 cp ${{ env.COVERAGE_OUTPUT_DIR }}/summary.json ${s3FullURI} --acl bucket-owner-full-control
174+
aws s3 cp "${{ env.COVERAGE_OUTPUT_DIR }}/summary.json" "${s3FullURI}" --acl bucket-owner-full-control
175175
lint:
176176
container: golangci/golangci-lint:v1.51
177177
name: lint
@@ -185,8 +185,7 @@ jobs:
185185
path: ci-scripts
186186
repository: pulumi/scripts
187187
- name: Mark repo as safe directory
188-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
189-
}}/pulumi-${{ env.PROVIDER }}
188+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
190189
- name: Unshallow clone for tags
191190
run: git fetch --prune --unshallow --tags
192191
- name: Install Go
@@ -221,8 +220,7 @@ jobs:
221220
path: ci-scripts
222221
repository: pulumi/scripts
223222
- name: Mark repo as safe directory
224-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
225-
}}/pulumi-${{ env.PROVIDER }}
223+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
226224
- name: Unshallow clone for tags
227225
run: git fetch --prune --unshallow --tags
228226
- name: Install Go
@@ -275,12 +273,13 @@ jobs:
275273
run: make provider
276274
- if: github.event_name == 'pull_request'
277275
name: Check Schema is Valid
278-
run: >-
279-
echo 'SCHEMA_CHANGES<<EOF' >> $GITHUB_ENV
280-
281-
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
282-
283-
echo 'EOF' >> $GITHUB_ENV
276+
run: |
277+
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
278+
{
279+
echo "SCHEMA_CHANGES<<$EOF";
280+
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json;
281+
echo "$EOF";
282+
} >> "$GITHUB_ENV"
284283
- if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]'
285284
name: Comment on PR with Details of Schema Check
286285
uses: thollander/actions-comment-pull-request@v2
@@ -342,8 +341,7 @@ jobs:
342341
role-session-name: ${{ env.PROVIDER }}@githubActions
343342
role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }}
344343
- name: Set PreRelease Version
345-
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)"
346-
>> $GITHUB_ENV
344+
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV"
347345
- name: Run GoReleaser
348346
uses: goreleaser/goreleaser-action@v2
349347
with:
@@ -363,7 +361,7 @@ jobs:
363361
runs-on: ubuntu-latest
364362
steps:
365363
- name: Publish SDKs
366-
uses: pulumi/[email protected].6
364+
uses: pulumi/[email protected].7
367365
- env:
368366
SLACK_CHANNEL: provider-upgrade-publish-status
369367
SLACK_COLOR: "#FF0000"
@@ -446,7 +444,7 @@ jobs:
446444
run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{
447445
github.workspace }}/sdk/${{ matrix.language }}
448446
- name: Update path
449-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
447+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
450448
- name: Install Python deps
451449
run: |-
452450
pip3 install virtualenv==20.0.23

.github/workflows/prerelease.yml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
22

33
env:
4+
PROVIDER: github
5+
IS_PRERELEASE: true
46
DOTNETVERSION: |
5-
6.0.x
6-
3.1.301
7+
6.0.x
8+
3.1.301
79
GH_ORGANIZATION: ${{ secrets.GH_ORGANIZATION }}
810
GH_TESTING_TOKEN: ${{ secrets.GH_TESTING_TOKEN }}
911
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1012
GOVERSION: 1.20.1
11-
IS_PRERELEASE: true
1213
JAVAVERSION: "11"
13-
NODEVERSION: 16.x
1414
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
15+
NODEVERSION: 16.x
1516
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1617
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
17-
PROVIDER: github
1818
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
1919
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
2020
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
@@ -91,10 +91,10 @@ jobs:
9191
- name: Install plugins
9292
run: make install_plugins
9393
- name: Update path
94-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
94+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
9595
- name: Set PACKAGE_VERSION to Env
9696
run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >>
97-
$GITHUB_ENV
97+
"$GITHUB_ENV"
9898
- name: Build SDK
9999
run: make build_${{ matrix.language }}
100100
- name: Check worktree clean
@@ -135,8 +135,7 @@ jobs:
135135
path: ci-scripts
136136
repository: pulumi/scripts
137137
- name: Mark repo as safe directory
138-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
139-
}}/pulumi-${{ env.PROVIDER }}
138+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
140139
- name: Unshallow clone for tags
141140
run: git fetch --prune --unshallow --tags
142141
- name: Install Go
@@ -171,8 +170,7 @@ jobs:
171170
path: ci-scripts
172171
repository: pulumi/scripts
173172
- name: Mark repo as safe directory
174-
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER
175-
}}/pulumi-${{ env.PROVIDER }}
173+
run: git config --global --add safe.directory /__w/pulumi-${{ env.PROVIDER }}/pulumi-${{ env.PROVIDER }}
176174
- name: Unshallow clone for tags
177175
run: git fetch --prune --unshallow --tags
178176
- name: Install Go
@@ -225,12 +223,13 @@ jobs:
225223
run: make provider
226224
- if: github.event_name == 'pull_request'
227225
name: Check Schema is Valid
228-
run: >-
229-
echo 'SCHEMA_CHANGES<<EOF' >> $GITHUB_ENV
230-
231-
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json >> $GITHUB_ENV
232-
233-
echo 'EOF' >> $GITHUB_ENV
226+
run: |
227+
EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
228+
{
229+
echo "SCHEMA_CHANGES<<$EOF";
230+
schema-tools compare -p ${{ env.PROVIDER }} -o ${{ github.event.repository.default_branch }} -n --local-path=provider/cmd/pulumi-resource-${{ env.PROVIDER }}/schema.json;
231+
echo "$EOF";
232+
} >> "$GITHUB_ENV"
234233
- if: github.event_name == 'pull_request' && github.actor != 'dependabot[bot]'
235234
name: Comment on PR with Details of Schema Check
236235
uses: thollander/actions-comment-pull-request@v2
@@ -292,8 +291,7 @@ jobs:
292291
role-session-name: ${{ env.PROVIDER }}@githubActions
293292
role-to-assume: ${{ secrets.AWS_UPLOAD_ROLE_ARN }}
294293
- name: Set PreRelease Version
295-
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)"
296-
>> $GITHUB_ENV
294+
run: echo "GORELEASER_CURRENT_TAG=v$(pulumictl get version --language generic)" >> "$GITHUB_ENV"
297295
- name: Run GoReleaser
298296
uses: goreleaser/goreleaser-action@v2
299297
with:
@@ -313,7 +311,7 @@ jobs:
313311
runs-on: ubuntu-latest
314312
steps:
315313
- name: Publish SDKs
316-
uses: pulumi/[email protected].6
314+
uses: pulumi/[email protected].7
317315
- env:
318316
SLACK_CHANNEL: provider-upgrade-publish-status
319317
SLACK_COLOR: "#FF0000"
@@ -396,7 +394,7 @@ jobs:
396394
run: tar -zxf ${{ github.workspace }}/sdk/${{ matrix.language }}.tar.gz -C ${{
397395
github.workspace }}/sdk/${{ matrix.language }}
398396
- name: Update path
399-
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
397+
run: echo "${{ github.workspace }}/bin" >> "$GITHUB_PATH"
400398
- name: Install Python deps
401399
run: |-
402400
pip3 install virtualenv==20.0.23

.github/workflows/pull-request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# WARNING: This file is autogenerated - changes will be overwritten if not made via https://github.com/pulumi/ci-mgmt
22

33
env:
4+
PROVIDER: github
45
DOTNETVERSION: |
5-
6.0.x
6-
3.1.301
6+
6.0.x
7+
3.1.301
78
GH_ORGANIZATION: ${{ secrets.GH_ORGANIZATION }}
89
GH_TESTING_TOKEN: ${{ secrets.GH_TESTING_TOKEN }}
910
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1011
GOVERSION: 1.20.1
1112
JAVAVERSION: "11"
12-
NODEVERSION: 16.x
1313
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
14+
NODEVERSION: 16.x
1415
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1516
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
16-
PROVIDER: github
1717
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
1818
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
1919
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}

0 commit comments

Comments
 (0)