diff --git a/synthtool/gcp/templates/node_library/.github/workflows/ci.yaml b/synthtool/gcp/templates/node_library/.github/workflows/ci.yaml index b01e5ebc9..f8d2653a8 100644 --- a/synthtool/gcp/templates/node_library/.github/workflows/ci.yaml +++ b/synthtool/gcp/templates/node_library/.github/workflows/ci.yaml @@ -9,10 +9,10 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node: [{{metadata['engine'] | int}}, {{metadata['engine'] | int+2}}, {{metadata['engine'] | int+4}}, {{metadata['engine'] | int+6}}] + node: [{{metadata['engine'] | int}}, {{metadata['engine'] | int+2}}, {{metadata['engine'] | int+4}}}] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: ${{ '{{' }} matrix.node {{ '}}' }} - run: node --version @@ -29,10 +29,10 @@ jobs: windows: runs-on: windows-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 14 + node-version: 18 - run: npm install --engine-strict - run: npm test env: @@ -40,19 +40,19 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 14 + node-version: 18 - run: npm install - run: npm run lint docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: - node-version: 14 + node-version: 18 - run: npm install - run: npm run docs - uses: JustinBeckwith/linkinator-action@v1 diff --git a/synthtool/gcp/templates/node_library/.kokoro/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/common.cfg index 09a843131..56289589e 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/common.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/common.cfg @@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/common.cfg similarity index 90% rename from synthtool/gcp/templates/node_library/.kokoro/continuous/node14/common.cfg rename to synthtool/gcp/templates/node_library/.kokoro/continuous/node18/common.cfg index 09a843131..56289589e 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/common.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/common.cfg @@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/lint.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/lint.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/continuous/node14/lint.cfg rename to synthtool/gcp/templates/node_library/.kokoro/continuous/node18/lint.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/samples-test.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/samples-test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/continuous/node14/samples-test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/continuous/node18/samples-test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/system-test.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/system-test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/continuous/node14/system-test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/continuous/node18/system-test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/continuous/node14/test.cfg b/synthtool/gcp/templates/node_library/.kokoro/continuous/node18/test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/continuous/node14/test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/continuous/node18/test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/common.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/common.cfg similarity index 90% rename from synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/common.cfg rename to synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/common.cfg index 09a843131..56289589e 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/common.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/common.cfg @@ -16,7 +16,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { key: "TRAMPOLINE_BUILD_FILE" diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/samples-test.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/samples-test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/samples-test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/samples-test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/system-test.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/system-test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/system-test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/system-test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/test.cfg b/synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/test.cfg similarity index 100% rename from synthtool/gcp/templates/node_library/.kokoro/presubmit/node14/test.cfg rename to synthtool/gcp/templates/node_library/.kokoro/presubmit/node18/test.cfg diff --git a/synthtool/gcp/templates/node_library/.kokoro/release/docs-devsite.cfg b/synthtool/gcp/templates/node_library/.kokoro/release/docs-devsite.cfg index b12be83de..3655aa469 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/release/docs-devsite.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/release/docs-devsite.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/synthtool/gcp/templates/node_library/.kokoro/release/docs.cfg b/synthtool/gcp/templates/node_library/.kokoro/release/docs.cfg index 06d314b3f..cc24910f4 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/release/docs.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/release/docs.cfg @@ -11,7 +11,7 @@ before_action { # doc publications use a Python image. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } # Download trampoline resources. diff --git a/synthtool/gcp/templates/node_library/.kokoro/release/docs.sh b/synthtool/gcp/templates/node_library/.kokoro/release/docs.sh index 1d8f3f490..e9079a605 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/release/docs.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/release/docs.sh @@ -16,7 +16,7 @@ set -eo pipefail -# build jsdocs (Python is installed on the Node 10 docker image). +# build jsdocs (Python is installed on the Node 18 docker image). if [[ -z "$CREDENTIALS" ]]; then # if CREDENTIALS are explicitly set, assume we're testing locally # and don't set NPM_CONFIG_PREFIX. diff --git a/synthtool/gcp/templates/node_library/.kokoro/release/publish.cfg b/synthtool/gcp/templates/node_library/.kokoro/release/publish.cfg index dd463aca2..f0593cea6 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/release/publish.cfg +++ b/synthtool/gcp/templates/node_library/.kokoro/release/publish.cfg @@ -30,7 +30,7 @@ build_file: "{{ metadata['repository_name'] }}/.kokoro/trampoline_v2.sh" # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/node:14-user" + value: "gcr.io/cloud-devrel-kokoro-resources/node:18-user" } env_vars: { diff --git a/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh b/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh index ad84c00ce..59098966f 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/samples-test.sh @@ -56,7 +56,7 @@ fi # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/synthtool/gcp/templates/node_library/.kokoro/system-test.sh b/synthtool/gcp/templates/node_library/.kokoro/system-test.sh index a63f8837c..48a976869 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/system-test.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/system-test.sh @@ -49,7 +49,7 @@ npm run system-test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/synthtool/gcp/templates/node_library/.kokoro/test.bat b/synthtool/gcp/templates/node_library/.kokoro/test.bat index 0bb124052..caf825656 100644 --- a/synthtool/gcp/templates/node_library/.kokoro/test.bat +++ b/synthtool/gcp/templates/node_library/.kokoro/test.bat @@ -21,7 +21,7 @@ cd .. @rem we upgrade Node.js in the image: SET PATH=%PATH%;/cygdrive/c/Program Files/nodejs/npm -call nvm use v14.17.3 +call nvm use 18 call which node call npm install || goto :error diff --git a/synthtool/gcp/templates/node_library/.kokoro/test.sh b/synthtool/gcp/templates/node_library/.kokoro/test.sh index 862d478d3..0d9f6392a 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/test.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/test.sh @@ -39,7 +39,7 @@ npm test # codecov combines coverage across integration and unit tests. Include # the logic below for any environment you wish to collect coverage for: -COVERAGE_NODE=14 +COVERAGE_NODE=18 if npx check-node-version@3.3.0 --silent --node $COVERAGE_NODE; then NYC_BIN=./node_modules/nyc/bin/nyc.js if [ -f "$NYC_BIN" ]; then diff --git a/synthtool/gcp/templates/node_library/.kokoro/trampoline_v2.sh b/synthtool/gcp/templates/node_library/.kokoro/trampoline_v2.sh index 4d0311212..5d6cfcca5 100755 --- a/synthtool/gcp/templates/node_library/.kokoro/trampoline_v2.sh +++ b/synthtool/gcp/templates/node_library/.kokoro/trampoline_v2.sh @@ -44,7 +44,7 @@ # the project root. # # Here is an example for running this script. -# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:10-user \ +# TRAMPOLINE_IMAGE=gcr.io/cloud-devrel-kokoro-resources/node:18-user \ # TRAMPOLINE_BUILD_FILE=.kokoro/system-test.sh \ # .kokoro/trampoline_v2.sh