From f607559d4a99b95c1f3a85330676f318a22bf728 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Fri, 6 Sep 2024 12:00:44 +0200 Subject: [PATCH] Remove node-gyp dependency Signed-off-by: Artem Zatsarynnyi --- build/dockerfiles/dev.Dockerfile | 2 +- build/dockerfiles/linux-libc-ubi8.Dockerfile | 3 +-- build/dockerfiles/linux-libc-ubi9.Dockerfile | 3 +-- build/dockerfiles/linux-musl.Dockerfile | 3 --- rebase.sh | 2 -- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/build/dockerfiles/dev.Dockerfile b/build/dockerfiles/dev.Dockerfile index d0f983d35ab..9e043f0ccbf 100644 --- a/build/dockerfiles/dev.Dockerfile +++ b/build/dockerfiles/dev.Dockerfile @@ -34,7 +34,7 @@ ENV ZSH_DISABLE_COMPFIX="true" USER 10001 -ENV NODEJS_VERSION=20.9.0 +ENV NODEJS_VERSION=20.12.2 ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \ PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0 \ diff --git a/build/dockerfiles/linux-libc-ubi8.Dockerfile b/build/dockerfiles/linux-libc-ubi8.Dockerfile index 02c8a6ae88f..105fbbb7bef 100644 --- a/build/dockerfiles/linux-libc-ubi8.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi8.Dockerfile @@ -53,8 +53,7 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ fi; } \ && yum install -y $LIBSECRET $LIBKEYBOARD curl make cmake gcc gcc-c++ python3.9 git git-core-doc openssh less libX11-devel libxkbcommon bash tar gzip rsync patch \ && yum -y clean all && rm -rf /var/cache/yum \ - && npm install -g yarn@1.22.17 \ - && npm install -g node-gyp@9.4.1 + && npm install -g yarn@1.22.17 ######################################################### # diff --git a/build/dockerfiles/linux-libc-ubi9.Dockerfile b/build/dockerfiles/linux-libc-ubi9.Dockerfile index d92f8057878..0669ace2bd2 100644 --- a/build/dockerfiles/linux-libc-ubi9.Dockerfile +++ b/build/dockerfiles/linux-libc-ubi9.Dockerfile @@ -53,8 +53,7 @@ RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ fi; } \ && yum install -y $LIBSECRET $LIBKEYBOARD make cmake gcc gcc-c++ python3.9 git git-core-doc openssh less libX11-devel libxkbcommon krb5-devel bash tar gzip rsync patch npm \ && yum -y clean all && rm -rf /var/cache/yum \ - && npm install -g yarn@1.22.17 \ - && npm install -g node-gyp@9.4.1 + && npm install -g yarn@1.22.17 ######################################################### # diff --git a/build/dockerfiles/linux-musl.Dockerfile b/build/dockerfiles/linux-musl.Dockerfile index 97d6f232798..f563f9e60e6 100644 --- a/build/dockerfiles/linux-musl.Dockerfile +++ b/build/dockerfiles/linux-musl.Dockerfile @@ -43,9 +43,6 @@ ENV CXXFLAGS='-DNODE_API_EXPERIMENTAL_NOGC_ENV_OPT_OUT' # Initialize a git repository for code build tools RUN git init . -# install node-gyp (yarn already installed) -RUN npm install --global node-gyp@9 - # change network timeout (slow using multi-arch build) RUN yarn config set network-timeout 600000 -g diff --git a/rebase.sh b/rebase.sh index 194de7894ac..fa11612625d 100755 --- a/rebase.sh +++ b/rebase.sh @@ -146,8 +146,6 @@ apply_code_remote_yarn_lock_changes() { # reset the file from what is upstream git checkout --theirs code/remote/yarn.lock > /dev/null 2>&1 - yarn add node-gyp@9 - # update yarn lock yarn --ignore-scripts --cwd code/remote