Skip to content

Commit e26856d

Browse files
danielrbradleydanielrbradley
authored
Upgrade examples to net6.0 (pulumi#959)
* Upgrade examples to net6.0 * Revert "Remove explicit dotnet install (pulumi#957)" This reverts commit 81d07b1. * Upgrade dotnet to 6.0 * Use env instead of matrix for versions * Fix dotnet version
1 parent 81d07b1 commit e26856d

File tree

8 files changed

+111
-178
lines changed

8 files changed

+111
-178
lines changed

‎.github/workflows/cron.yml‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ env:
1818
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
1919
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
2020
VERSION_PREFIX: 1.0.0
21+
GOVERSION: "1.19.x"
22+
DOTNETVERSION: "6.x"
23+
PYTHONVERSION: "3.8"
24+
NODEVERSION: "16.x"
25+
JAVAVERSION: "11"
2126
jobs:
2227
lint:
2328
name: lint
@@ -69,11 +74,11 @@ jobs:
6974
- name: Install Go
7075
uses: actions/setup-go@v2
7176
with:
72-
go-version: ${{ matrix.goversion }}
77+
go-version: ${{ env.GOVERSION }}
7378
- name: Setup Node
7479
uses: actions/setup-node@v1
7580
with:
76-
node-version: ${{matrix.nodeversion}}
81+
node-version: ${{env.NODEVERSION}}
7782
registry-url: https://registry.npmjs.org
7883
- name: Install Yarn
7984
run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
@@ -110,13 +115,6 @@ jobs:
110115
author_name: Failure in building provider
111116
fields: repo,commit,author,action
112117
status: ${{ job.status }}
113-
strategy:
114-
fail-fast: false
115-
matrix:
116-
goversion:
117-
- 1.19.x
118-
nodeversion:
119-
- 16.x
120118
acceptance-test:
121119
needs: build-provider
122120
runs-on: ubuntu-latest
@@ -139,22 +137,26 @@ jobs:
139137
- name: Install Go
140138
uses: actions/setup-go@v2
141139
with:
142-
go-version: ${{ matrix.goversion }}
140+
go-version: ${{ env.GOVERSION }}
143141
- name: Setup Node
144142
uses: actions/setup-node@v1
145143
with:
146-
node-version: ${{matrix.nodeversion}}
144+
node-version: ${{env.NODEVERSION}}
147145
registry-url: https://registry.npmjs.org
148146
- name: Setup Python
149147
uses: actions/setup-python@v2
150148
with:
151-
python-version: ${{matrix.pythonversion}}
149+
python-version: ${{env.PYTHONVERSION}}
150+
- name: Setup DotNet
151+
uses: actions/setup-dotnet@v1
152+
with:
153+
dotnet-version: ${{env.DOTNETVERSION}}
152154
- name: Setup Java
153155
uses: actions/setup-java@v3
154156
with:
155157
cache: gradle
156158
distribution: temurin
157-
java-version: ${{matrix.javaversion}}
159+
java-version: ${{env.JAVAVERSION}}
158160
- name: Install Python deps
159161
run: |-
160162
pip3 install virtualenv==20.0.23
@@ -200,14 +202,6 @@ jobs:
200202
strategy:
201203
fail-fast: false
202204
matrix:
203-
goversion:
204-
- 1.19.x
205-
pythonversion:
206-
- 3.8
207-
nodeversion:
208-
- 16.x
209-
javaversion:
210-
- 11
211205
language:
212206
- nodejs
213207
- python

‎.github/workflows/master.yml‎

Lines changed: 23 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ env:
1818
SIGNING_KEY_ID: ${{ secrets.JAVA_SIGNING_KEY_ID }}
1919
SIGNING_PASSWORD: ${{ secrets.JAVA_SIGNING_PASSWORD }}
2020
VERSION_PREFIX: 1.0.0
21+
GOVERSION: "1.19.x"
22+
DOTNETVERSION: "6.x"
23+
PYTHONVERSION: "3.8"
24+
NODEVERSION: "16.x"
25+
JAVAVERSION: "11"
2126
jobs:
2227
lint:
2328
name: lint
@@ -69,11 +74,11 @@ jobs:
6974
- name: Install Go
7075
uses: actions/setup-go@v2
7176
with:
72-
go-version: ${{ matrix.goversion }}
77+
go-version: ${{ env.GOVERSION }}
7378
- name: Setup Node
7479
uses: actions/setup-node@v1
7580
with:
76-
node-version: ${{matrix.nodeversion}}
81+
node-version: ${{env.NODEVERSION}}
7782
registry-url: https://registry.npmjs.org
7883
- name: Install Yarn
7984
run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
@@ -110,13 +115,6 @@ jobs:
110115
author_name: Failure in building provider
111116
fields: repo,commit,author,action
112117
status: ${{ job.status }}
113-
strategy:
114-
fail-fast: false
115-
matrix:
116-
goversion:
117-
- 1.19.x
118-
nodeversion:
119-
- 16.x
120118
acceptance-test:
121119
needs: build-provider
122120
runs-on: ubuntu-latest
@@ -139,22 +137,26 @@ jobs:
139137
- name: Install Go
140138
uses: actions/setup-go@v2
141139
with:
142-
go-version: ${{ matrix.goversion }}
140+
go-version: ${{ env.GOVERSION }}
143141
- name: Setup Node
144142
uses: actions/setup-node@v1
145143
with:
146-
node-version: ${{matrix.nodeversion}}
144+
node-version: ${{env.NODEVERSION}}
147145
registry-url: https://registry.npmjs.org
148146
- name: Setup Python
149147
uses: actions/setup-python@v2
150148
with:
151-
python-version: ${{matrix.pythonversion}}
149+
python-version: ${{env.PYTHONVERSION}}
150+
- name: Setup DotNet
151+
uses: actions/setup-dotnet@v1
152+
with:
153+
dotnet-version: ${{env.DOTNETVERSION}}
152154
- name: Setup Java
153155
uses: actions/setup-java@v3
154156
with:
155157
cache: gradle
156158
distribution: temurin
157-
java-version: ${{matrix.javaversion}}
159+
java-version: ${{env.JAVAVERSION}}
158160
- name: Install Python deps
159161
run: |-
160162
pip3 install virtualenv==20.0.23
@@ -200,14 +202,6 @@ jobs:
200202
strategy:
201203
fail-fast: false
202204
matrix:
203-
goversion:
204-
- 1.19.x
205-
pythonversion:
206-
- 3.8
207-
nodeversion:
208-
- 16.x
209-
javaversion:
210-
- 11
211205
language:
212206
- nodejs
213207
- python
@@ -280,23 +274,27 @@ jobs:
280274
- name: Install Go
281275
uses: actions/setup-go@v2
282276
with:
283-
go-version: ${{ matrix.goversion }}
277+
go-version: ${{ env.GOVERSION }}
278+
- name: Setup DotNet
279+
uses: actions/setup-dotnet@v1
280+
with:
281+
dotnet-version: ${{env.DOTNETVERSION}}
284282
- name: Setup Node
285283
uses: actions/setup-node@v1
286284
with:
287285
always-auth: true
288286
registry-url: https://registry.npmjs.org
289-
node-version: ${{matrix.nodeversion}}
287+
node-version: ${{env.NODEVERSION}}
290288
- name: Setup Python
291289
uses: actions/setup-python@v2
292290
with:
293-
python-version: ${{matrix.pythonversion}}
291+
python-version: ${{env.PYTHONVERSION}}
294292
- name: Setup Java
295293
uses: actions/setup-java@v3
296294
with:
297295
cache: gradle
298296
distribution: temurin
299-
java-version: ${{matrix.javaversion}}
297+
java-version: ${{env.JAVAVERSION}}
300298
- name: Download python SDK
301299
uses: actions/download-artifact@v2
302300
with:
@@ -339,17 +337,6 @@ jobs:
339337
arguments: publishToSonatype closeAndReleaseSonatypeStagingRepository
340338
build-root-directory: ./sdk/java
341339
gradle-version: 7.4.1
342-
strategy:
343-
fail-fast: false
344-
matrix:
345-
goversion:
346-
- 1.19.x
347-
nodeversion:
348-
- 16.x
349-
pythonversion:
350-
- "3.7"
351-
javaversion:
352-
- 11
353340
name: master
354341
"on":
355342
push:

‎.github/workflows/old-release.yml‎

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup Node
2626
uses: actions/setup-node@v1
2727
with:
28-
node-version: ${{matrix.nodeversion}}
28+
node-version: ${{env.NODEVERSION}}
2929
registry-url: https://registry.npmjs.org
3030
- name: Install Yarn
3131
run: curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.13.0
@@ -51,7 +51,7 @@ jobs:
5151
- name: Install Go
5252
uses: actions/setup-go@v2
5353
with:
54-
go-version: ${{ matrix.goversion }}
54+
go-version: ${{ env.GOVERSION }}
5555
- name: Install pulumictl
5656
uses: jaxxstorm/action-install-gh-release@v1.1.0
5757
with:
@@ -61,14 +61,15 @@ jobs:
6161
- name: Setup Node
6262
uses: actions/setup-node@v1
6363
with:
64-
node-version: ${{matrix.nodeversion}}
64+
node-version: ${{env.NODEVERSION}}
6565
registry-url: https://registry.npmjs.org
6666
- name: Build SDK
6767
run: make --makefile=Makefile.old build_${{ matrix.language }}
6868
- name: Check worktree clean
6969
run: ./ci-scripts/ci/check-worktree-is-clean
7070
- name: Compress SDK folder
71-
run: tar -zcf ${{ matrix.language }}/${{ matrix.language }}.tar.gz -C ${{ matrix.language }}/awsx
71+
run:
72+
tar -zcf ${{ matrix.language }}/${{ matrix.language }}.tar.gz -C ${{ matrix.language }}/awsx
7273
.
7374
- name: Upload artifacts
7475
uses: actions/upload-artifact@v2
@@ -77,15 +78,6 @@ jobs:
7778
path: ${{ github.workspace}}/${{ matrix.language }}/${{ matrix.language }}.tar.gz
7879
- name: Run SDK tests
7980
run: make --makefile=Makefile.old istanbul_tests
80-
strategy:
81-
fail-fast: true
82-
matrix:
83-
goversion:
84-
- 1.16.x
85-
language:
86-
- nodejs
87-
nodeversion:
88-
- 13.x
8981
publish_sdk:
9082
name: publish_sdk
9183
needs: test
@@ -103,7 +95,7 @@ jobs:
10395
- name: Install Go
10496
uses: actions/setup-go@v2
10597
with:
106-
go-version: ${{ matrix.goversion }}
98+
go-version: ${{ env.GOVERSION }}
10799
- name: Install pulumictl
108100
uses: jaxxstorm/action-install-gh-release@v1.1.0
109101
with:
@@ -157,7 +149,7 @@ jobs:
157149
- name: Install Go
158150
uses: actions/setup-go@v2
159151
with:
160-
go-version: ${{ matrix.goversion }}
152+
go-version: ${{ env.GOVERSION }}
161153
- name: Install pulumictl
162154
uses: jaxxstorm/action-install-gh-release@v1.1.0
163155
with:
@@ -167,15 +159,16 @@ jobs:
167159
- name: Setup Node
168160
uses: actions/setup-node@v1
169161
with:
170-
node-version: ${{matrix.nodeversion}}
162+
node-version: ${{env.NODEVERSION}}
171163
registry-url: https://registry.npmjs.org
172164
- name: Download SDK
173165
uses: actions/download-artifact@v2
174166
with:
175167
name: ${{ matrix.language }}-sdk.tar.gz
176168
path: ${{ github.workspace}}/${{ matrix.language }}/
177169
- name: Uncompress SDK folder
178-
run: tar -zxf ${{ github.workspace}}/${{ matrix.language }}/${{ matrix.language }}.tar.gz -C ${{
170+
run:
171+
tar -zxf ${{ github.workspace}}/${{ matrix.language }}/${{ matrix.language }}.tar.gz -C ${{
179172
github.workspace}}/${{ matrix.language}}/awsx
180173
- name: Install dependencies
181174
run: make --makefile=Makefile.old install_${{ matrix.language}}_sdk
@@ -190,15 +183,6 @@ jobs:
190183
role-to-assume: ${{ secrets.AWS_CI_ROLE_ARN }}
191184
- name: Run tests
192185
run: make --makefile=Makefile.old test_${{ matrix.language}}
193-
strategy:
194-
fail-fast: true
195-
matrix:
196-
goversion:
197-
- 1.16.x
198-
language:
199-
- nodejs
200-
nodeversion:
201-
- 13.x
202186
name: release
203187
"on":
204188
push:

0 commit comments

Comments
 (0)