From 8bd31e854d1cc4705ef0d323c65f3567706c2ca9 Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 10:34:09 -0400 Subject: [PATCH 1/7] WIP node 18 --- .tool-versions | 2 +- DEVELOPMENT.md | 2 +- Dockerfile | 2 +- Dockerfile.it | 2 +- ui/.tool-versions | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 ui/.tool-versions diff --git a/.tool-versions b/.tool-versions index adfa00c135..e6f13478c0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ golang 1.17.6 -nodejs 16.13.2 +nodejs 18.4.0 ruby 2.6.3 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 7694a31778..52a851a233 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -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/#/) diff --git a/Dockerfile b/Dockerfile index fa212fe80c..8b612bd166 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/Dockerfile.it b/Dockerfile.it index bc25610931..daa9825085 100644 --- a/Dockerfile.it +++ b/Dockerfile.it @@ -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 diff --git a/ui/.tool-versions b/ui/.tool-versions new file mode 100644 index 0000000000..4d21f34b28 --- /dev/null +++ b/ui/.tool-versions @@ -0,0 +1 @@ +nodejs 18.4.0 From 979d922b0452ce60b887d8c22af75e3e951ddb38 Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 11:15:44 -0400 Subject: [PATCH 2/7] Update UI README --- ui/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/README.md b/ui/README.md index 7c9ea58802..38a6f4eb98 100644 --- a/ui/README.md +++ b/ui/README.md @@ -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/) From 607d5e984f16f1bd90f38b9ed273ab901d96f9ed Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 11:18:55 -0400 Subject: [PATCH 3/7] Update IT action version --- .github/workflows/integration-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index f90c092fef..9157b006f1 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: "16" + node-version: "18" - uses: arduino/setup-task@v1 From d69ad8cbc6cb3c72c0f21aeb2fade7012ce71f9a Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 11:35:09 -0400 Subject: [PATCH 4/7] only push IT image on main branch --- .github/workflows/integration-test-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test-image.yml b/.github/workflows/integration-test-image.yml index e7f7a472f5..d204a79146 100644 --- a/.github/workflows/integration-test-image.yml +++ b/.github/workflows/integration-test-image.yml @@ -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 From 7c2675ebf894200b988da310f1039f19debc26a9 Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 11:39:21 -0400 Subject: [PATCH 5/7] single quotes --- .github/workflows/integration-test-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-test-image.yml b/.github/workflows/integration-test-image.yml index d204a79146..74443c2122 100644 --- a/.github/workflows/integration-test-image.yml +++ b/.github/workflows/integration-test-image.yml @@ -33,7 +33,7 @@ jobs: with: context: . file: Dockerfile.it - push: ${{ github.branch.name == "main"}} + 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 From 9e81e721ae76b5cc07fa87cd9878d1f2d38fb79f Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 11:49:19 -0400 Subject: [PATCH 6/7] openssl-legacy-provider --- Taskfile.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Taskfile.yml b/Taskfile.yml index 7ff463a145..ee239f5c30 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -36,6 +36,8 @@ tasks: desc: Install UI dependencies cmds: - cd ui && yarn --frozen-lockfile + vars: + NODE_OPTIONS: --openssl-legacy-provider bench: desc: Run benchmarks From 5c4dc99efd062a5aefead1abe1ffe03b1a894644 Mon Sep 17 00:00:00 2001 From: Mark Phelps Date: Mon, 27 Jun 2022 12:39:20 -0400 Subject: [PATCH 7/7] set node options as env var, not var --- Taskfile.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Taskfile.yml b/Taskfile.yml index ee239f5c30..3212e2441b 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -22,7 +22,7 @@ tasks: deps: [assets:deps] cmds: - cd ui && yarn build - vars: + env: NODE_OPTIONS: --openssl-legacy-provider sources: - ./ui/static/* @@ -36,7 +36,7 @@ tasks: desc: Install UI dependencies cmds: - cd ui && yarn --frozen-lockfile - vars: + env: NODE_OPTIONS: --openssl-legacy-provider bench: