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

WIP: Upgrade to node 18 #911

Merged
merged 9 commits into from
Jun 27, 2022
Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/integration-test-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
with:
context: .
file: Dockerfile.it
push: true
push: ${{ github.branch.name == 'main'}}
tags: ghcr.io/markphelps/flipt-integration-test:latest
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: "16"
node-version: "18"

- uses: arduino/setup-task@v1

Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
golang 1.17.6
nodejs 16.13.2
nodejs 18.4.0
ruby 2.6.3
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Before starting, make sure you have the following installed:
- GCC Compiler
- [SQLite](https://sqlite.org/index.html)
- [Go 1.17+](https://golang.org/doc/install)
- [NodeJS >= 16](https://nodejs.org/en/)
- [NodeJS >= 18](https://nodejs.org/en/)
- [Yarn](https://yarnpkg.com/en/)
- [Task](https://taskfile.dev/#/)

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN apt-get update && \
RUN curl -sSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list

RUN curl -sSL https://deb.nodesource.com/setup_16.x | bash && \
RUN curl -sSL https://deb.nodesource.com/setup_18.x | bash && \
apt-get update && \
apt-get install -y --no-install-recommends \
nodejs \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.it
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN echo 'tzdata tzdata/Areas select Etc' | debconf-set-selections; \
apt-get install -y \
sudo tzdata bats curl wget jq gnupg

RUN curl -sL https://deb.nodesource.com/setup_16.x | bash
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash

RUN apt-get update && \
apt-get install -y nodejs
Expand Down
4 changes: 3 additions & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ tasks:
deps: [assets:deps]
cmds:
- cd ui && yarn build
vars:
env:
NODE_OPTIONS: --openssl-legacy-provider
sources:
- ./ui/static/*
Expand All @@ -36,6 +36,8 @@ tasks:
desc: Install UI dependencies
cmds:
- cd ui && yarn --frozen-lockfile
env:
NODE_OPTIONS: --openssl-legacy-provider

bench:
desc: Run benchmarks
Expand Down
1 change: 1 addition & 0 deletions ui/.tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodejs 18.4.0
2 changes: 1 addition & 1 deletion ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ The ui directory contains these `.vue` files, along with others used in the web

## Build Requirements

- [NodeJS >= 16](https://nodejs.org/en/)
- [NodeJS >= 18](https://nodejs.org/en/)
- [Yarn](https://yarnpkg.com/en/)