Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of CC-6137 to release 1.17.x #19361

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
- name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '14'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock'

Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
- name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '14'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock'

Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
- name: Setup with node and yarn
uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '14'
node-version: '18'
cache: 'yarn'
cache-dependency-path: 'ui/yarn.lock'

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '16'
node-version: '18'

- name: Install Yarn
run: npm install -g yarn
run: corepack enable

# Install dependencies.
- name: install yarn packages
Expand All @@ -57,10 +57,10 @@ jobs:

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '16'
node-version: '18'

- name: Install Yarn
run: npm install -g yarn
run: corepack enable

# Install dependencies.
- name: install yarn packages
Expand All @@ -86,10 +86,10 @@ jobs:

- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: '16'
node-version: '18'

- name: Install Yarn
run: npm install -g yarn
run: corepack enable

- name: Install Chrome
uses: browser-actions/setup-chrome@c485fa3bab6be59dce18dbc18ef6ab7cbc8ff5f1 # v1.2.0
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nightly-test-1.13.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/nightly-test-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
# Not necessary to use yarn, but enables caching
- uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
with:
node-version: 14
node-version: 18
cache: 'yarn'
cache-dependency-path: ./ui/yarn.lock

Expand Down
3 changes: 2 additions & 1 deletion build-support/docker/Build-UI.dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

FROM docker.mirror.hashicorp.services/circleci/node:16-browsers
FROM docker.mirror.hashicorp.services/node:18-alpine

USER root

RUN apk update && apk add make
RUN mkdir /consul-src
WORKDIR /consul-src
CMD make dist-docker
2 changes: 1 addition & 1 deletion ui/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"ember-basic-dropdown": "3.0.21"
},
"engines": {
"node": ">=14 <=16"
"node": "18"
}
}
2 changes: 1 addition & 1 deletion ui/packages/consul-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ See [./docs/index.mdx](./docs/index.mdx#environment-variables)
We follow a `ui/**/**` branch naming pattern. This branch naming pattern allows
front-end focused builds, such as FE tests, to run automatically in Pull
Requests. Please note this only works if you are a member of the HashiCorp
GitHub Org. If you are an external contributor these tests won't run and will
GitHub Org. If you are an external contributor, these tests won't run and will
instead be run by a member of our team during review.

Examples:
Expand Down
4 changes: 2 additions & 2 deletions ui/packages/consul-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
"webpack": "^5.74.0"
},
"engines": {
"node": ">=14 <=16"
"node": "18"
},
"ember": {
"edition": "octane"
Expand All @@ -214,7 +214,7 @@
]
},
"volta": {
"node": "14.20.1"
"node": "18"
},
"dependencies": {
"doctoc": "^2.0.0"
Expand Down
Loading
Loading