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.

Sign up for GitHub

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

Avoid the direct dependency to node-gyp since it's bundled with npm #403

Merged
merged 1 commit into from
Sep 16, 2024
Merged

Avoid the direct dependency to node-gyp since it's bundled with npm #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build/dockerfiles/dev.Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading