Skip to content

Commit

Permalink
Merge pull request #3463 from terascope/update-node-versions
Browse files Browse the repository at this point in the history
Update node versions
  • Loading branch information
godber authored Nov 21, 2023
2 parents bbe7c13 + ba1154e commit 90d23d3
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

Expand All @@ -54,7 +54,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
registry-url: 'https://registry.npmjs.org'
cache: 'yarn'

Expand All @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
steps:
# we login to docker to publish new teraslice image
- name: Login to Docker Hub
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
cache: 'yarn'

- name: Install and build packages
Expand All @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand All @@ -57,7 +57,7 @@ jobs:
# opensearch is finiky, keep testing others if it fails
fail-fast: false
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2]
steps:
- name: Check out code
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
# opensearch is finiky, keep testing others if it fails
fail-fast: false
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2]
steps:
- name: Check out code
Expand Down Expand Up @@ -129,7 +129,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
cache: 'yarn'

# we login to docker to avoid docker pull limit rates
Expand All @@ -154,7 +154,7 @@ jobs:
# opensearch is finiky, keep testing others if it fails
fail-fast: false
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2]
steps:
- name: Check out code
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.16.0
node-version: 18.18.2
cache: 'yarn'

# we login to docker to avoid docker pull limit rates
Expand All @@ -218,7 +218,7 @@ jobs:
# opensearch is finiky, keep testing others if it fails
fail-fast: false
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
search-version: [elasticsearch6, elasticsearch7, opensearch1, opensearch2]
steps:
- name: Check out code
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
# opensearch is finiky, keep testing others if it fails
fail-fast: false
matrix:
node-version: [16.19.1, 18.16.0]
node-version: [16.20.2, 18.18.2]
steps:
- name: Check out code
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# NODE_VERSION is set by default in the config.ts, the following value will only
# be used if you build images by default with docker build
ARG NODE_VERSION=18.16.0
ARG NODE_VERSION=18.18.2
FROM terascope/node-base:${NODE_VERSION}

ENV NODE_ENV production
Expand Down
6 changes: 3 additions & 3 deletions packages/scripts/src/cmds/publish.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ const cmd: CommandModule<GlobalCMDOptions, Options> = {
.example('$0 publish', '-t tag docker')
.example('$0 publish', '-t dev docker')
.example('$0 publish', '-t latest docker')
.example('$0 publish', '-n 18.16.0 -t latest docker')
.example('$0 publish', '-n 18.18.2 -t latest docker')
.example('$0 publish', '--dry-run docker')
.example('$0 publish', '-n 18.16.0 --dry-run docker')
.example('$0 publish', '-n 18.18.2 --dry-run docker')
.example('$0 publish', '-t tag npm')
.example('$0 publish', '-t latest npm')
.example('$0 publish', '--dry-run npm')
Expand All @@ -49,7 +49,7 @@ const cmd: CommandModule<GlobalCMDOptions, Options> = {
})
.option('node-version', {
alias: 'n',
description: 'Node version, there must be a Docker base image with this version (e.g. 18.16.0)',
description: 'Node version, there must be a Docker base image with this version (e.g. 18.18.2)',
type: 'string',
default: NODE_VERSION
})
Expand Down
2 changes: 1 addition & 1 deletion packages/scripts/src/cmds/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ const cmd: CommandModule<GlobalCMDOptions, Options> = {
default: config.OPENSEARCH_VERSION,
})
.option('node-version', {
description: 'Node version, there must be a Docker base image with this version (e.g. 18.16.0)',
description: 'Node version, there must be a Docker base image with this version (e.g. 18.18.2)',
type: 'string',
default: config.NODE_VERSION
})
Expand Down
2 changes: 1 addition & 1 deletion packages/scripts/src/helpers/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,6 @@ export const SEARCH_TEST_HOST = testHost;
// This should match a node version from the base-docker-image repo:
// https://github.com/terascope/base-docker-image
// This overrides the value in the Dockerfile
export const NODE_VERSION = process.env.NODE_VERSION || '18.16.0';
export const NODE_VERSION = process.env.NODE_VERSION || '18.18.2';

export const { TEST_PLATFORM = 'native' } = process.env;

0 comments on commit 90d23d3

Please sign in to comment.