Skip to content

Commit

Permalink
Remove node-gyp dependency (#403)
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Zatsarynnyi <[email protected]>
  • Loading branch information
azatsarynnyy authored Sep 16, 2024
1 parent dbb1ab4 commit 5a3639e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/dockerfiles/dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
3 changes: 1 addition & 2 deletions build/dockerfiles/linux-libc-ubi8.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] \
&& npm install -g [email protected]
&& npm install -g [email protected]

#########################################################
#
Expand Down
3 changes: 1 addition & 2 deletions build/dockerfiles/linux-libc-ubi9.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] \
&& npm install -g [email protected]
&& npm install -g [email protected]

#########################################################
#
Expand Down
3 changes: 0 additions & 3 deletions build/dockerfiles/linux-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 5a3639e

Please sign in to comment.