Skip to content

Commit 3b92a88

Browse files
stack72stack72
authored
Merge pull request #163 from pulumi/stack72/v1.17.1
2 parents 11f3098 + 987a5af commit 3b92a88

File tree

129 files changed

+14725
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+14725
-1035
lines changed

‎.github/workflows/command-dispatch.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ env:
44
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
55
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
66
PROVIDER: postgresql
7+
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
8+
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
79
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
810
PULUMI_API: https://api.pulumi-staging.io
911
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
1012
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
1113
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
14+
SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
15+
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
16+
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
1217
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
1318
TRAVIS_OS_NAME: linux
1419
jobs:

‎.github/workflows/community-moderation.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ jobs:
1818
uses: dorny/paths-filter@v2
1919
with:
2020
filters: "changed: 'sdk/*'"
21-
- if: steps.sdk_changed.outputs.changed == 'true'
21+
- if: steps.sdk_changed.outputs.changed == 'true' &&
22+
github.event.pull_request.head.repo.full_name != github.repository
2223
name: Send codegen warning as comment on PR
2324
uses: thollander/actions-comment-pull-request@v1
2425
with:

‎.github/workflows/main.yml‎

Lines changed: 80 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@ env:
44
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
55
NUGET_PUBLISH_KEY: ${{ secrets.NUGET_PUBLISH_KEY }}
66
PROVIDER: postgresql
7+
PUBLISH_REPO_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
8+
PUBLISH_REPO_USERNAME: ${{ secrets.OSSRH_USERNAME }}
79
PULUMI_ACCESS_TOKEN: ${{ secrets.PULUMI_ACCESS_TOKEN }}
810
PULUMI_API: https://api.pulumi-staging.io
911
PULUMI_GO_DEP_ROOT: ${{ github.workspace }}/..
1012
PULUMI_LOCAL_NUGET: ${{ github.workspace }}/nuget
1113
PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
14+
SIGNING_KEY: ${{ secrets.JAVA_SIGNING_KEY }}
15+
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
16+
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
1217
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
1318
TRAVIS_OS_NAME: linux
1419
jobs:
@@ -31,7 +36,7 @@ jobs:
3136
with:
3237
go-version: ${{matrix.goversion}}
3338
- name: Install pulumictl
34-
uses: jaxxstorm/action-install-gh-release@v1.2.0
39+
uses: jaxxstorm/action-install-gh-release@v1.5.0
3540
with:
3641
repo: pulumi/pulumictl
3742
- name: Install Pulumi CLI
@@ -49,6 +54,12 @@ jobs:
4954
uses: actions/setup-python@v2
5055
with:
5156
python-version: ${{matrix.pythonversion}}
57+
- name: Setup Java
58+
uses: actions/setup-java@v3
59+
with:
60+
cache: gradle
61+
distribution: temurin
62+
java-version: ${{matrix.javaversion}}
5263
- name: Download provider + tfgen binaries
5364
uses: actions/download-artifact@v2
5465
with:
@@ -64,6 +75,9 @@ jobs:
6475
run: make install_plugins
6576
- name: Update path
6677
run: echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
78+
- name: Set PACKAGE_VERSION to Env
79+
run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >>
80+
$GITHUB_ENV
6781
- name: Build SDK
6882
run: make build_${{ matrix.language }}
6983
- name: Check worktree clean
@@ -88,16 +102,19 @@ jobs:
88102
dotnetversion:
89103
- 3.1.301
90104
goversion:
91-
- 1.18.x
105+
- 1.19.x
106+
javaversion:
107+
- "11"
92108
language:
93109
- nodejs
94110
- python
95111
- dotnet
96112
- go
113+
- java
97114
nodeversion:
98-
- 14.x
115+
- 16.x
99116
pythonversion:
100-
- "3.7"
117+
- "3.9"
101118
generate_coverage_data:
102119
continue-on-error: true
103120
env:
@@ -126,14 +143,14 @@ jobs:
126143
with:
127144
go-version: ${{matrix.goversion}}
128145
- name: Install pulumictl
129-
uses: jaxxstorm/action-install-gh-release@v1.2.0
146+
uses: jaxxstorm/action-install-gh-release@v1.5.0
130147
with:
131148
repo: pulumi/pulumictl
132149
- name: Install Pulumi CLI
133150
uses: pulumi/action-install-pulumi-cli@v2
134151
- if: github.event_name == 'pull_request'
135152
name: Install Schema Tools
136-
uses: jaxxstorm/action-install-gh-release@v1.2.0
153+
uses: jaxxstorm/action-install-gh-release@v1.5.0
137154
with:
138155
repo: mikhailshilkov/schema-tools
139156
- name: Echo Coverage Output Dir
@@ -153,7 +170,7 @@ jobs:
153170
fail-fast: true
154171
matrix:
155172
goversion:
156-
- 1.18.x
173+
- 1.19.x
157174
lint:
158175
container: golangci/golangci-lint:latest
159176
name: lint
@@ -173,7 +190,7 @@ jobs:
173190
with:
174191
go-version: ${{matrix.goversion}}
175192
- name: Install pulumictl
176-
uses: jaxxstorm/action-install-gh-release@v1.2.0
193+
uses: jaxxstorm/action-install-gh-release@v1.5.0
177194
with:
178195
repo: pulumi/pulumictl
179196
- name: Install Pulumi CLI
@@ -190,7 +207,7 @@ jobs:
190207
fail-fast: true
191208
matrix:
192209
goversion:
193-
- 1.18.x
210+
- 1.19.x
194211
lint_sdk:
195212
container: golangci/golangci-lint:latest
196213
name: lint-sdk
@@ -211,7 +228,7 @@ jobs:
211228
with:
212229
go-version: ${{matrix.goversion}}
213230
- name: Install pulumictl
214-
uses: jaxxstorm/action-install-gh-release@v1.2.0
231+
uses: jaxxstorm/action-install-gh-release@v1.5.0
215232
with:
216233
repo: pulumi/pulumictl
217234
- name: Install Pulumi CLI
@@ -228,7 +245,7 @@ jobs:
228245
fail-fast: true
229246
matrix:
230247
goversion:
231-
- 1.18.x
248+
- 1.19.x
232249
prerequisites:
233250
name: prerequisites
234251
runs-on: ubuntu-latest
@@ -247,14 +264,14 @@ jobs:
247264
with:
248265
go-version: ${{matrix.goversion}}
249266
- name: Install pulumictl
250-
uses: jaxxstorm/action-install-gh-release@v1.2.0
267+
uses: jaxxstorm/action-install-gh-release@v1.5.0
251268
with:
252269
repo: pulumi/pulumictl
253270
- name: Install Pulumi CLI
254271
uses: pulumi/action-install-pulumi-cli@v2
255272
- if: github.event_name == 'pull_request'
256273
name: Install Schema Tools
257-
uses: jaxxstorm/action-install-gh-release@v1.2.0
274+
uses: jaxxstorm/action-install-gh-release@v1.5.0
258275
with:
259276
repo: mikhailshilkov/schema-tools
260277
- name: Build tfgen & provider binaries
@@ -298,11 +315,11 @@ jobs:
298315
dotnetversion:
299316
- 3.1.301
300317
goversion:
301-
- 1.18.x
318+
- 1.19.x
302319
nodeversion:
303-
- 14.x
320+
- 16.x
304321
pythonversion:
305-
- "3.7"
322+
- "3.9"
306323
publish:
307324
name: publish
308325
needs: test
@@ -317,7 +334,7 @@ jobs:
317334
with:
318335
go-version: ${{matrix.goversion}}
319336
- name: Install pulumictl
320-
uses: jaxxstorm/action-install-gh-release@v1.2.0
337+
uses: jaxxstorm/action-install-gh-release@v1.5.0
321338
with:
322339
repo: pulumi/pulumictl
323340
- name: Install Pulumi CLI
@@ -354,11 +371,11 @@ jobs:
354371
dotnetversion:
355372
- 3.1.301
356373
goversion:
357-
- 1.18.x
374+
- 1.19.x
358375
nodeversion:
359-
- 14.x
376+
- 16.x
360377
pythonversion:
361-
- "3.7"
378+
- "3.9"
362379
publish_sdk:
363380
name: publish_sdk
364381
needs: publish
@@ -378,7 +395,7 @@ jobs:
378395
with:
379396
go-version: ${{matrix.goversion}}
380397
- name: Install pulumictl
381-
uses: jaxxstorm/action-install-gh-release@v1.2.0
398+
uses: jaxxstorm/action-install-gh-release@v1.5.0
382399
with:
383400
repo: pulumi/pulumictl
384401
- name: Install Pulumi CLI
@@ -396,6 +413,12 @@ jobs:
396413
uses: actions/setup-python@v2
397414
with:
398415
python-version: ${{matrix.pythonversion}}
416+
- name: Setup Java
417+
uses: actions/setup-java@v3
418+
with:
419+
cache: gradle
420+
distribution: temurin
421+
java-version: ${{matrix.javaversion}}
399422
- name: Download python SDK
400423
uses: actions/download-artifact@v2
401424
with:
@@ -420,11 +443,28 @@ jobs:
420443
- name: Uncompress nodejs SDK
421444
run: tar -zxf ${{github.workspace}}/sdk/nodejs.tar.gz -C
422445
${{github.workspace}}/sdk/nodejs
446+
- name: Download java SDK
447+
uses: actions/download-artifact@v2
448+
with:
449+
name: java-sdk.tar.gz
450+
path: ${{ github.workspace}}/sdk/
451+
- name: Uncompress java SDK
452+
run: tar -zxf ${{github.workspace}}/sdk/java.tar.gz -C
453+
${{github.workspace}}/sdk/java
423454
- run: python -m pip install pip twine
424455
- env:
425456
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
426457
name: Publish SDKs
427458
run: ./ci-scripts/ci/publish-tfgen-package ${{ github.workspace }}
459+
- name: Set PACKAGE_VERSION to Env
460+
run: echo "PACKAGE_VERSION=$(pulumictl get version --language generic)" >>
461+
$GITHUB_ENV
462+
- name: Publish Java SDK
463+
uses: gradle/gradle-build-action@9b814496b50909128c6a52622b416c5ffa04db49
464+
with:
465+
arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository
466+
build-root-directory: ./sdk/java
467+
gradle-version: 7.4.1
428468
- if: failure() && github.event_name == 'push'
429469
name: Notify Slack
430470
uses: 8398a7/action-slack@v3
@@ -438,11 +478,13 @@ jobs:
438478
dotnetversion:
439479
- 3.1.301
440480
goversion:
441-
- 1.18.x
481+
- 1.19.x
482+
javaversion:
483+
- "11"
442484
nodeversion:
443-
- 14.x
485+
- 16.x
444486
pythonversion:
445-
- "3.7"
487+
- "3.9"
446488
test:
447489
name: test
448490
needs: build_sdk
@@ -462,7 +504,7 @@ jobs:
462504
with:
463505
go-version: ${{matrix.goversion}}
464506
- name: Install pulumictl
465-
uses: jaxxstorm/action-install-gh-release@v1.2.0
507+
uses: jaxxstorm/action-install-gh-release@v1.5.0
466508
with:
467509
repo: pulumi/pulumictl
468510
- name: Install Pulumi CLI
@@ -480,6 +522,12 @@ jobs:
480522
uses: actions/setup-python@v2
481523
with:
482524
python-version: ${{matrix.pythonversion}}
525+
- name: Setup Java
526+
uses: actions/setup-java@v3
527+
with:
528+
cache: gradle
529+
distribution: temurin
530+
java-version: ${{matrix.javaversion}}
483531
- name: Download provider + tfgen binaries
484532
uses: actions/download-artifact@v2
485533
with:
@@ -511,7 +559,7 @@ jobs:
511559
- name: Install dependencies
512560
run: make install_${{ matrix.language}}_sdk
513561
- name: Install gotestfmt
514-
uses: jaxxstorm/action-install-gh-release@v1.2.0
562+
uses: jaxxstorm/action-install-gh-release@v1.5.0
515563
with:
516564
repo: haveyoudebuggedit/gotestfmt
517565
- name: Run tests
@@ -530,16 +578,19 @@ jobs:
530578
dotnetversion:
531579
- 3.1.301
532580
goversion:
533-
- 1.18.x
581+
- 1.19.x
582+
javaversion:
583+
- "11"
534584
language:
535585
- nodejs
536586
- python
537587
- dotnet
538588
- go
589+
- java
539590
nodeversion:
540-
- 14.x
591+
- 16.x
541592
pythonversion:
542-
- "3.7"
593+
- "3.9"
543594
name: main
544595
on:
545596
push:

0 commit comments

Comments
 (0)