From 4eedafe9c06782308cae1280f0de5169c6dcb7fc Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Jun 2023 15:33:11 -0700 Subject: [PATCH 1/2] feat!: Test & Support only latest NodeJS. BREAKING CHANGE: This library no longer tests against nor supports NodeJS 12 or 14. --- buildspec.yml | 30 +++++++++---------- codebuild/{browser.yml => browser18.yml} | 0 codebuild/{nodejs14.yml => nodejs18.yml} | 7 +++-- codebuild/{nodejs_latest.yml => nodejs20.yml} | 2 +- .../{browser.yml => browser18.yml} | 0 .../{nodejs12.yml => nodejs18.yml} | 9 ++++-- .../{nodejs14.yml => nodejs20.yml} | 9 ++++-- codebuild/test_vectors/nodejs_latest.yml | 24 --------------- 8 files changed, 32 insertions(+), 49 deletions(-) rename codebuild/{browser.yml => browser18.yml} (100%) rename codebuild/{nodejs14.yml => nodejs18.yml} (74%) rename codebuild/{nodejs_latest.yml => nodejs20.yml} (95%) rename codebuild/test_vectors/{browser.yml => browser18.yml} (100%) rename codebuild/test_vectors/{nodejs12.yml => nodejs18.yml} (74%) rename codebuild/test_vectors/{nodejs14.yml => nodejs20.yml} (74%) delete mode 100644 codebuild/test_vectors/nodejs_latest.yml diff --git a/buildspec.yml b/buildspec.yml index c62bd485c..b0be47216 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -3,42 +3,40 @@ version: 0.2 batch: fast-fail: false build-list: - - identifier: testNodejsLatest - buildspec: codebuild/nodejs_latest.yml + - identifier: testNodejs20 + buildspec: codebuild/nodejs20.yml env: image: aws/codebuild/standard:5.0 - - identifier: testNodejs14 - buildspec: codebuild/nodejs14.yml + - identifier: testNodejs18 + buildspec: codebuild/nodejs18.yml env: image: aws/codebuild/standard:5.0 - identifier: testNodejs16 buildspec: codebuild/nodejs16.yml env: image: aws/codebuild/standard:5.0 - - identifier: testBrowser - buildspec: codebuild/browser.yml + - identifier: testBrowser18 + buildspec: codebuild/browser18.yml env: image: aws/codebuild/standard:5.0 - identifier: compliance buildspec: codebuild/compliance.yml env: image: aws/codebuild/standard:5.0 - - identifier: testVectorsNodejsLatest - buildspec: codebuild/test_vectors/nodejs_latest.yml + - identifier: testVectorsNodejs16 + buildspec: codebuild/test_vectors/nodejs16.yml env: - variables: - PUBLISH_LOCAL: "true" image: aws/codebuild/standard:5.0 - - identifier: testVectorsNodejs14 - buildspec: codebuild/test_vectors/nodejs14.yml + - identifier: testVectorsNodejs18 + buildspec: codebuild/test_vectors/nodejs18.yml env: image: aws/codebuild/standard:5.0 - - identifier: testVectorsNodejs16 - buildspec: codebuild/test_vectors/nodejs16.yml + - identifier: testVectorsNodejs20 + buildspec: codebuild/test_vectors/nodejs20.yml env: image: aws/codebuild/standard:5.0 - - identifier: testVectorsBrowser - buildspec: codebuild/test_vectors/browser.yml + - identifier: testVectorsBrowser18 + buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" diff --git a/codebuild/browser.yml b/codebuild/browser18.yml similarity index 100% rename from codebuild/browser.yml rename to codebuild/browser18.yml diff --git a/codebuild/nodejs14.yml b/codebuild/nodejs18.yml similarity index 74% rename from codebuild/nodejs14.yml rename to codebuild/nodejs18.yml index ffa3816b4..6b43b4055 100644 --- a/codebuild/nodejs14.yml +++ b/codebuild/nodejs18.yml @@ -6,11 +6,14 @@ env: phases: install: - runtime-versions: - nodejs: 14 commands: + - n 18 + - node -v + - npm -v - npm ci --unsafe-perm - npm run build build: commands: + - npm -v + - node -v - npm run coverage-node diff --git a/codebuild/nodejs_latest.yml b/codebuild/nodejs20.yml similarity index 95% rename from codebuild/nodejs_latest.yml rename to codebuild/nodejs20.yml index e63722902..dc597a082 100644 --- a/codebuild/nodejs_latest.yml +++ b/codebuild/nodejs20.yml @@ -7,7 +7,7 @@ env: phases: install: commands: - - n 18 + - n 20 - node --version ; npm --version - npm ci --unsafe-perm - npm run build diff --git a/codebuild/test_vectors/browser.yml b/codebuild/test_vectors/browser18.yml similarity index 100% rename from codebuild/test_vectors/browser.yml rename to codebuild/test_vectors/browser18.yml diff --git a/codebuild/test_vectors/nodejs12.yml b/codebuild/test_vectors/nodejs18.yml similarity index 74% rename from codebuild/test_vectors/nodejs12.yml rename to codebuild/test_vectors/nodejs18.yml index 2660804c2..98d0864e0 100644 --- a/codebuild/test_vectors/nodejs12.yml +++ b/codebuild/test_vectors/nodejs18.yml @@ -7,13 +7,16 @@ env: phases: install: - runtime-versions: - nodejs: 12 commands: - - npm ci + - n 18 + - node -v + - npm -v + - npm ci --unsafe-perm - npm run build build: commands: + - npm -v + - node -v - npm run verdaccio-publish - npm run verdaccio-node-decrypt - npm run verdaccio-node-encrypt diff --git a/codebuild/test_vectors/nodejs14.yml b/codebuild/test_vectors/nodejs20.yml similarity index 74% rename from codebuild/test_vectors/nodejs14.yml rename to codebuild/test_vectors/nodejs20.yml index 551ad6fc2..99c657a7d 100644 --- a/codebuild/test_vectors/nodejs14.yml +++ b/codebuild/test_vectors/nodejs20.yml @@ -7,13 +7,16 @@ env: phases: install: - runtime-versions: - nodejs: 14 commands: - - npm ci + - n 20 + - node -v + - npm -v + - npm ci --unsafe-perm - npm run build build: commands: + - npm -v + - node -v - npm run verdaccio-publish - npm run verdaccio-node-decrypt - npm run verdaccio-node-encrypt diff --git a/codebuild/test_vectors/nodejs_latest.yml b/codebuild/test_vectors/nodejs_latest.yml deleted file mode 100644 index 5feacc26b..000000000 --- a/codebuild/test_vectors/nodejs_latest.yml +++ /dev/null @@ -1,24 +0,0 @@ -version: 0.2 - -env: - variables: - NODE_OPTIONS: "--max-old-space-size=4096" - NPM_CONFIG_UNSAFE_PERM: true - -phases: - install: - commands: - - n 18 - - npm ci - - |- - if [ "$PUBLISH_LOCAL" = "true" ]; then - npm run build - fi - build: - commands: - - |- - if [ "$PUBLISH_LOCAL" = "true" ]; then - npm run verdaccio-publish - fi - - npm run verdaccio-node-decrypt - - npm run verdaccio-node-encrypt From a17b37b414f1f87738e1a585c0aaf782dbfc241e Mon Sep 17 00:00:00 2001 From: texastony <5892063+texastony@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:59:17 -0700 Subject: [PATCH 2/2] fix: CB BuildSpec --- buildspec.yml | 6 ++++++ codebuild/release/prod-release.yml | 28 ++++++++++++++-------------- codebuild/test_vectors/browser18.yml | 2 +- codebuild/test_vectors/nodejs16.yml | 13 ++++++++----- codebuild/test_vectors/nodejs18.yml | 13 ++++++++----- codebuild/test_vectors/nodejs20.yml | 13 ++++++++----- 6 files changed, 45 insertions(+), 30 deletions(-) diff --git a/buildspec.yml b/buildspec.yml index b0be47216..3f8d21987 100644 --- a/buildspec.yml +++ b/buildspec.yml @@ -26,14 +26,20 @@ batch: - identifier: testVectorsNodejs16 buildspec: codebuild/test_vectors/nodejs16.yml env: + variables: + PUBLISH_LOCAL: "true" image: aws/codebuild/standard:5.0 - identifier: testVectorsNodejs18 buildspec: codebuild/test_vectors/nodejs18.yml env: + variables: + PUBLISH_LOCAL: "true" image: aws/codebuild/standard:5.0 - identifier: testVectorsNodejs20 buildspec: codebuild/test_vectors/nodejs20.yml env: + variables: + PUBLISH_LOCAL: "true" image: aws/codebuild/standard:5.0 - identifier: testVectorsBrowser18 buildspec: codebuild/test_vectors/browser18.yml diff --git a/codebuild/release/prod-release.yml b/codebuild/release/prod-release.yml index 9a22529ef..3046d8803 100644 --- a/codebuild/release/prod-release.yml +++ b/codebuild/release/prod-release.yml @@ -9,22 +9,22 @@ batch: buildspec: codebuild/compliance.yml # Unit Tests - - identifier: testNodejsLatest - buildspec: codebuild/nodejs_latest.yml + - identifier: testNodejs20 + buildspec: codebuild/nodejs20.yml env: image: aws/codebuild/standard:5.0 - - identifier: testBrowser - buildspec: codebuild/browser.yml + - identifier: testBrowser18 + buildspec: codebuild/browser18.yml # Integration Tests - - identifier: testVectorsNodejsLatest - buildspec: codebuild/test_vectors/nodejs_latest.yml + - identifier: testVectorsNodejs20 + buildspec: codebuild/test_vectors/nodejs20.yml env: variables: PUBLISH_LOCAL: "true" image: aws/codebuild/standard:5.0 - - identifier: testVectorsBrowser - buildspec: codebuild/test_vectors/browser.yml + - identifier: testVectorsBrowser18 + buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "true" @@ -34,10 +34,10 @@ batch: - identifier: version depend-on: - compliance - - testNodejsLatest - - testBrowser - - testVectorsNodejsLatest - - testVectorsBrowser + - testNodejs20 + - testBrowser18 + - testVectorsNodejs20 + - testVectorsBrowser18 buildspec: codebuild/release/version.yml # Publish the release to npm @@ -50,7 +50,7 @@ batch: - identifier: validateNodejs depend-on: - publish - buildspec: codebuild/test_vectors/nodejs_latest.yml + buildspec: codebuild/test_vectors/nodejs20.yml env: variables: PUBLISH_LOCAL: "false" @@ -58,7 +58,7 @@ batch: - identifier: validateBrowser depend-on: - publish - buildspec: codebuild/test_vectors/browser.yml + buildspec: codebuild/test_vectors/browser18.yml env: variables: PUBLISH_LOCAL: "false" diff --git a/codebuild/test_vectors/browser18.yml b/codebuild/test_vectors/browser18.yml index 741ba9ae6..4ae2a8e97 100644 --- a/codebuild/test_vectors/browser18.yml +++ b/codebuild/test_vectors/browser18.yml @@ -9,7 +9,7 @@ phases: install: commands: - n 18 - - npm ci + - npm ci --unsafe-perm - |- if [ "$PUBLISH_LOCAL" = "true" ]; then npm run build diff --git a/codebuild/test_vectors/nodejs16.yml b/codebuild/test_vectors/nodejs16.yml index 1a3ed3f0a..42e78f246 100644 --- a/codebuild/test_vectors/nodejs16.yml +++ b/codebuild/test_vectors/nodejs16.yml @@ -9,14 +9,17 @@ phases: install: commands: - n 16 - - node -v - - npm -v - npm ci --unsafe-perm - - npm run build + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run build + fi build: commands: - - npm -v - node -v - - npm run verdaccio-publish + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run verdaccio-publish + fi - npm run verdaccio-node-decrypt - npm run verdaccio-node-encrypt diff --git a/codebuild/test_vectors/nodejs18.yml b/codebuild/test_vectors/nodejs18.yml index 98d0864e0..982c2b1b7 100644 --- a/codebuild/test_vectors/nodejs18.yml +++ b/codebuild/test_vectors/nodejs18.yml @@ -9,14 +9,17 @@ phases: install: commands: - n 18 - - node -v - - npm -v - npm ci --unsafe-perm - - npm run build + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run build + fi build: commands: - - npm -v - node -v - - npm run verdaccio-publish + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run verdaccio-publish + fi - npm run verdaccio-node-decrypt - npm run verdaccio-node-encrypt diff --git a/codebuild/test_vectors/nodejs20.yml b/codebuild/test_vectors/nodejs20.yml index 99c657a7d..3a2657beb 100644 --- a/codebuild/test_vectors/nodejs20.yml +++ b/codebuild/test_vectors/nodejs20.yml @@ -9,14 +9,17 @@ phases: install: commands: - n 20 - - node -v - - npm -v - npm ci --unsafe-perm - - npm run build + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run build + fi build: commands: - - npm -v - node -v - - npm run verdaccio-publish + - |- + if [ "$PUBLISH_LOCAL" = "true" ]; then + npm run verdaccio-publish + fi - npm run verdaccio-node-decrypt - npm run verdaccio-node-encrypt