Skip to content

Commit 61e979a

Browse files
committed
Merge branch 'tony-update-tests' into tony-drop-sdk-v2
2 parents 139cc00 + a17b37b commit 61e979a

File tree

11 files changed

+74
-76
lines changed

11 files changed

+74
-76
lines changed

buildspec.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,46 @@ version: 0.2
33
batch:
44
fast-fail: false
55
build-list:
6-
- identifier: testNodejsLatest
7-
buildspec: codebuild/nodejs_latest.yml
6+
- identifier: testNodejs20
7+
buildspec: codebuild/nodejs20.yml
88
env:
99
image: aws/codebuild/standard:5.0
10-
- identifier: testNodejs14
11-
buildspec: codebuild/nodejs14.yml
10+
- identifier: testNodejs18
11+
buildspec: codebuild/nodejs18.yml
1212
env:
1313
image: aws/codebuild/standard:5.0
1414
- identifier: testNodejs16
1515
buildspec: codebuild/nodejs16.yml
1616
env:
1717
image: aws/codebuild/standard:5.0
18-
- identifier: testBrowser
19-
buildspec: codebuild/browser.yml
18+
- identifier: testBrowser18
19+
buildspec: codebuild/browser18.yml
2020
env:
2121
image: aws/codebuild/standard:5.0
2222
- identifier: compliance
2323
buildspec: codebuild/compliance.yml
2424
env:
2525
image: aws/codebuild/standard:5.0
26-
- identifier: testVectorsNodejsLatest
27-
buildspec: codebuild/test_vectors/nodejs_latest.yml
26+
- identifier: testVectorsNodejs16
27+
buildspec: codebuild/test_vectors/nodejs16.yml
2828
env:
2929
variables:
3030
PUBLISH_LOCAL: "true"
3131
image: aws/codebuild/standard:5.0
32-
- identifier: testVectorsNodejs14
33-
buildspec: codebuild/test_vectors/nodejs14.yml
32+
- identifier: testVectorsNodejs18
33+
buildspec: codebuild/test_vectors/nodejs18.yml
3434
env:
35+
variables:
36+
PUBLISH_LOCAL: "true"
3537
image: aws/codebuild/standard:5.0
36-
- identifier: testVectorsNodejs16
37-
buildspec: codebuild/test_vectors/nodejs16.yml
38+
- identifier: testVectorsNodejs20
39+
buildspec: codebuild/test_vectors/nodejs20.yml
3840
env:
41+
variables:
42+
PUBLISH_LOCAL: "true"
3943
image: aws/codebuild/standard:5.0
40-
- identifier: testVectorsBrowser
41-
buildspec: codebuild/test_vectors/browser.yml
44+
- identifier: testVectorsBrowser18
45+
buildspec: codebuild/test_vectors/browser18.yml
4246
env:
4347
variables:
4448
PUBLISH_LOCAL: "true"
File renamed without changes.

codebuild/nodejs14.yml renamed to codebuild/nodejs18.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@ env:
66

77
phases:
88
install:
9-
runtime-versions:
10-
nodejs: 14
119
commands:
10+
- n 18
11+
- node -v
12+
- npm -v
1213
- npm ci --unsafe-perm
1314
- npm run build
1415
build:
1516
commands:
17+
- npm -v
18+
- node -v
1619
- npm run coverage-node

codebuild/nodejs_latest.yml renamed to codebuild/nodejs20.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
phases:
88
install:
99
commands:
10-
- n 18
10+
- n 20
1111
- node --version ; npm --version
1212
- npm ci --unsafe-perm
1313
- npm run build

codebuild/release/prod-release.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@ batch:
99
buildspec: codebuild/compliance.yml
1010

1111
# Unit Tests
12-
- identifier: testNodejsLatest
13-
buildspec: codebuild/nodejs_latest.yml
12+
- identifier: testNodejs20
13+
buildspec: codebuild/nodejs20.yml
1414
env:
1515
image: aws/codebuild/standard:5.0
16-
- identifier: testBrowser
17-
buildspec: codebuild/browser.yml
16+
- identifier: testBrowser18
17+
buildspec: codebuild/browser18.yml
1818

1919
# Integration Tests
20-
- identifier: testVectorsNodejsLatest
21-
buildspec: codebuild/test_vectors/nodejs_latest.yml
20+
- identifier: testVectorsNodejs20
21+
buildspec: codebuild/test_vectors/nodejs20.yml
2222
env:
2323
variables:
2424
PUBLISH_LOCAL: "true"
2525
image: aws/codebuild/standard:5.0
26-
- identifier: testVectorsBrowser
27-
buildspec: codebuild/test_vectors/browser.yml
26+
- identifier: testVectorsBrowser18
27+
buildspec: codebuild/test_vectors/browser18.yml
2828
env:
2929
variables:
3030
PUBLISH_LOCAL: "true"
@@ -34,10 +34,10 @@ batch:
3434
- identifier: version
3535
depend-on:
3636
- compliance
37-
- testNodejsLatest
38-
- testBrowser
39-
- testVectorsNodejsLatest
40-
- testVectorsBrowser
37+
- testNodejs20
38+
- testBrowser18
39+
- testVectorsNodejs20
40+
- testVectorsBrowser18
4141
buildspec: codebuild/release/version.yml
4242

4343
# Publish the release to npm
@@ -50,15 +50,15 @@ batch:
5050
- identifier: validateNodejs
5151
depend-on:
5252
- publish
53-
buildspec: codebuild/test_vectors/nodejs_latest.yml
53+
buildspec: codebuild/test_vectors/nodejs20.yml
5454
env:
5555
variables:
5656
PUBLISH_LOCAL: "false"
5757
image: aws/codebuild/standard:5.0
5858
- identifier: validateBrowser
5959
depend-on:
6060
- publish
61-
buildspec: codebuild/test_vectors/browser.yml
61+
buildspec: codebuild/test_vectors/browser18.yml
6262
env:
6363
variables:
6464
PUBLISH_LOCAL: "false"

codebuild/test_vectors/browser.yml renamed to codebuild/test_vectors/browser18.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ phases:
99
install:
1010
commands:
1111
- n 18
12-
- npm ci
12+
- npm ci --unsafe-perm
1313
- |-
1414
if [ "$PUBLISH_LOCAL" = "true" ]; then
1515
npm run build

codebuild/test_vectors/nodejs12.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

codebuild/test_vectors/nodejs14.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

codebuild/test_vectors/nodejs16.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@ phases:
99
install:
1010
commands:
1111
- n 16
12-
- node -v
13-
- npm -v
1412
- npm ci --unsafe-perm
15-
- npm run build
13+
- |-
14+
if [ "$PUBLISH_LOCAL" = "true" ]; then
15+
npm run build
16+
fi
1617
build:
1718
commands:
18-
- npm -v
1919
- node -v
20-
- npm run verdaccio-publish
20+
- |-
21+
if [ "$PUBLISH_LOCAL" = "true" ]; then
22+
npm run verdaccio-publish
23+
fi
2124
- npm run verdaccio-node-decrypt
2225
- npm run verdaccio-node-encrypt

codebuild/test_vectors/nodejs_latest.yml renamed to codebuild/test_vectors/nodejs18.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,14 @@ phases:
99
install:
1010
commands:
1111
- n 18
12-
- npm ci
12+
- npm ci --unsafe-perm
1313
- |-
1414
if [ "$PUBLISH_LOCAL" = "true" ]; then
1515
npm run build
1616
fi
1717
build:
1818
commands:
19+
- node -v
1920
- |-
2021
if [ "$PUBLISH_LOCAL" = "true" ]; then
2122
npm run verdaccio-publish

codebuild/test_vectors/nodejs20.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
version: 0.2
2+
3+
env:
4+
variables:
5+
NODE_OPTIONS: "--max-old-space-size=4096"
6+
NPM_CONFIG_UNSAFE_PERM: true
7+
8+
phases:
9+
install:
10+
commands:
11+
- n 20
12+
- npm ci --unsafe-perm
13+
- |-
14+
if [ "$PUBLISH_LOCAL" = "true" ]; then
15+
npm run build
16+
fi
17+
build:
18+
commands:
19+
- node -v
20+
- |-
21+
if [ "$PUBLISH_LOCAL" = "true" ]; then
22+
npm run verdaccio-publish
23+
fi
24+
- npm run verdaccio-node-decrypt
25+
- npm run verdaccio-node-encrypt

0 commit comments

Comments
 (0)