From 499bc11e5ab989a7f96270a7c814f12a6469bb58 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Wed, 30 Aug 2023 16:20:15 -0300 Subject: [PATCH] chore: CRW-4820 bump to node 18... (#2731) * chore: CRW-4820 bump to node 18 requirement Change-Id: If63b174ae61f8fef473c35d5ada426bc963b6359 Signed-off-by: Nick Boldt * bump from node 16.13 and 16.13.2 to 18.16.1 Change-Id: Iaf15b8f16a799e7f5a2cba199fd7bff51ec61b58 Signed-off-by: Nick Boldt * fix bad merge Change-Id: I004cb297833156ae182fd7bbb11377e97da50eb6 Signed-off-by: Nick Boldt * Install node 18 for OpenShift tests Signed-off-by: Anatolii Bazko * fix typo Signed-off-by: Anatolii Bazko * fix typo Signed-off-by: Anatolii Bazko * Install node 18 for OpenShift tests Signed-off-by: Anatolii Bazko * Install node 18 for OpenShift tests (#2734) Signed-off-by: Anatolii Bazko * chore: Revert Dockerfile for OpenShift CI (#2735) Signed-off-by: Anatolii Bazko * bump to node 18 in .ci/openshift-ci/Dockerfile too Change-Id: I278dff1d88bfb51767d53a3e62f995b568dc1af1 Signed-off-by: Nick Boldt * build a better chectl build environment for use with openshift-ci Change-Id: I4acfc99eae0a0e45804f4c2c54bfd73a4c4931e6 Signed-off-by: Nick Boldt --------- Signed-off-by: Nick Boldt Signed-off-by: Anatolii Bazko Co-authored-by: Anatolii Bazko --- .ci/openshift-ci/Dockerfile | 22 ++++++++++++++----- .github/workflows/codecov.yml | 2 +- .../minikube-chectl-commands-tests.yml | 4 ++-- .../minikube-chectl-release-test.yml | 2 +- .github/workflows/pr-check.yml | 6 ++--- .../release-build-and-push-to-GH-releases.yml | 2 +- .github/workflows/release.yml | 2 +- package.json | 2 +- yarn.lock | 4 ++-- 9 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile index a7b6a6d0e..c7f9e2f3e 100644 --- a/.ci/openshift-ci/Dockerfile +++ b/.ci/openshift-ci/Dockerfile @@ -1,5 +1,5 @@ # -# Copyright (c) 2019-2021 Red Hat, Inc. +# Copyright (c) 2019-2023 Red Hat, Inc. # This program and the accompanying materials are made # available under the terms of the Eclipse Public License 2.0 # which is available at https://www.eclipse.org/legal/epl-2.0/ @@ -11,9 +11,21 @@ # # Dockerfile to bootstrap build and test in openshift-ci +FROM registry.access.redhat.com/ubi9/nodejs-18:1 +# hadolint ignore=DL3002 +USER 0 -FROM registry.ci.openshift.org/openshift/release:golang-1.18 +# hadolint ignore=DL3041 +RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs \ + # already installed or installed as deps: + openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \ + dnf update -y && dnf clean all && \ + npm install -g yarn@1.22 npm@9 && \ + echo -n "node version: "; node -v; \ + echo -n "npm version: "; npm -v; \ + echo -n "yarn version: "; yarn -v -RUN curl -sL https://rpm.nodesource.com/setup_16.x | bash - && \ - yum-config-manager --add-repo https://dl.yarnpkg.com/rpm/yarn.repo && \ - yum install -y yarn +# to build chectl in this container, uncomment these lines +# resulting tarball will be in /opt/app-root/src/chectl*.tgz +# COPY . /opt/app-root/src +# RUN yarn && yarn pack && yarn test diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index afcbfa350..3a54ade9d 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -23,7 +23,7 @@ jobs: persist-credentials: false - uses: actions/setup-node@v3 with: - node-version: 16.13.2 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Install codecov diff --git a/.github/workflows/minikube-chectl-commands-tests.yml b/.github/workflows/minikube-chectl-commands-tests.yml index 2d779d3df..54f5efdae 100644 --- a/.github/workflows/minikube-chectl-commands-tests.yml +++ b/.github/workflows/minikube-chectl-commands-tests.yml @@ -28,7 +28,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13.2 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Run e2e tests @@ -57,7 +57,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13.2 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Run tests diff --git a/.github/workflows/minikube-chectl-release-test.yml b/.github/workflows/minikube-chectl-release-test.yml index 0c6f35f9b..9a1ce1935 100644 --- a/.github/workflows/minikube-chectl-release-test.yml +++ b/.github/workflows/minikube-chectl-release-test.yml @@ -28,7 +28,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13.2 + node-version: 18.16.1 - name: Pack chectl binaries run: yarn && npx oclif-dev pack --targets=linux-x64 - name: UnPack chectl binaries in $HOME/chectl diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index c4b43cb9d..64279c2ab 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -24,7 +24,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13.2 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Run eslint @@ -42,7 +42,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Build README.md @@ -66,7 +66,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13 + node-version: 18.16.1 - name: Build chectl run: yarn - name: Set up Go 1.15 diff --git a/.github/workflows/release-build-and-push-to-GH-releases.yml b/.github/workflows/release-build-and-push-to-GH-releases.yml index dd7f095cf..57cc0fa85 100644 --- a/.github/workflows/release-build-and-push-to-GH-releases.yml +++ b/.github/workflows/release-build-and-push-to-GH-releases.yml @@ -29,7 +29,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13 + node-version: 18.16.1 - name: Generate tag utilities id: TAG_UTIL run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0b381f2be..b1136f681 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: - name: Install NodeJS uses: actions/setup-node@v3 with: - node-version: 16.13 + node-version: 18.16.1 - name: Check existing tags run: | set +e diff --git a/package.json b/package.json index e0467fbf4..7a3bb8820 100644 --- a/package.json +++ b/package.json @@ -74,7 +74,7 @@ "typescript-formatter": "7.2.2" }, "engines": { - "node": ">=16.0.0" + "node": ">=18.0.0" }, "files": [ "/bin", diff --git a/yarn.lock b/yarn.lock index 5de877ae8..3ee40ef56 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2463,7 +2463,7 @@ detect-newline@^3.0.0: "devworkspace-operator@https://github.com/devfile/devworkspace-operator#main": version "0.0.0" - resolved "https://github.com/devfile/devworkspace-operator#39be751bc9c99bdd2905b896c8a4f19c0f796d43" + resolved "https://github.com/devfile/devworkspace-operator#3889f6b588c292642300d175dc09a40ea73d9c5c" diff-sequences@^29.4.2: version "29.4.2" @@ -2506,7 +2506,7 @@ ecc-jsbn@~0.1.1: "eclipse-che-operator@https://github.com/eclipse-che/che-operator#main": version "0.0.0" - resolved "https://github.com/eclipse-che/che-operator#1bd44bdb28d20716fb7523d83f249945334d9641" + resolved "https://github.com/eclipse-che/che-operator#6cf8df2b860b81ea53b3bc98aafe6c25a313aa7c" editorconfig@^0.15.0: version "0.15.3"