mirror of
https://github.com/oven-sh/bun
synced 2026-02-02 15:08:46 +00:00
Revert "Upgrade self-reported Node.js version from 22.6.0 to 24.3.0 (#20659) [publish images]"
This reverts commit 80309e4d59. It breaks the Windows CI.
This commit is contained in:
Ben Grant
@@ -1,4 +1,4 @@
|
||||
# Version: 9
|
||||
# Version: 8
|
||||
# A script that installs the dependencies needed to build and test Bun.
|
||||
# This should work on Windows 10 or newer with PowerShell.
|
||||
|
||||
@@ -240,11 +240,11 @@ function Install-Git {
|
||||
}
|
||||
|
||||
function Install-NodeJs {
|
||||
Install-Package nodejs -Command node -Version "24.3.0"
|
||||
Install-Package nodejs -Command node -Version "22.9.0"
|
||||
}
|
||||
|
||||
function Install-Bun {
|
||||
Install-Package bun -Version "1.2.17"
|
||||
Install-Package bun -Version "1.1.30"
|
||||
}
|
||||
|
||||
function Install-Cygwin {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
# Version: 12
|
||||
# Version: 11
|
||||
|
||||
# A script that installs the dependencies needed to build and test Bun.
|
||||
# This should work on macOS and Linux with a POSIX shell.
|
||||
@@ -130,7 +130,7 @@ create_directory() {
|
||||
create_tmp_directory() {
|
||||
mktemp="$(require mktemp)"
|
||||
path="$(execute "$mktemp" -d)"
|
||||
grant_to_user "$path"
|
||||
grant_to_user "$path"
|
||||
print "$path"
|
||||
}
|
||||
|
||||
@@ -191,7 +191,7 @@ download_file() {
|
||||
|
||||
fetch "$file_url" >"$file_tmp_path"
|
||||
grant_to_user "$file_tmp_path"
|
||||
|
||||
|
||||
print "$file_tmp_path"
|
||||
}
|
||||
|
||||
@@ -317,7 +317,7 @@ check_operating_system() {
|
||||
distro="$("$sw_vers" -productName)"
|
||||
release="$("$sw_vers" -productVersion)"
|
||||
fi
|
||||
|
||||
|
||||
case "$arch" in
|
||||
x64)
|
||||
sysctl="$(which sysctl)"
|
||||
@@ -534,7 +534,7 @@ check_ulimit() {
|
||||
append_file "$dpkg_conf" "force-unsafe-io"
|
||||
append_file "$dpkg_conf" "no-debsig"
|
||||
|
||||
apt_conf="/etc/apt/apt.conf.d/99-ci-options"
|
||||
apt_conf="/etc/apt/apt.conf.d/99-ci-options"
|
||||
execute_sudo create_directory "$(dirname "$apt_conf")"
|
||||
append_file "$apt_conf" 'Acquire::Languages "none";'
|
||||
append_file "$apt_conf" 'Acquire::GzipIndexes "true";'
|
||||
@@ -711,7 +711,12 @@ install_common_software() {
|
||||
}
|
||||
|
||||
nodejs_version_exact() {
|
||||
print "24.3.0"
|
||||
# https://unofficial-builds.nodejs.org/download/release/
|
||||
if ! [ "$abi" = "musl" ] && [ -n "$abi_version" ] && ! [ "$(compare_version "$abi_version" "2.27")" = "1" ]; then
|
||||
print "16.9.1"
|
||||
else
|
||||
print "22.9.0"
|
||||
fi
|
||||
}
|
||||
|
||||
nodejs_version() {
|
||||
@@ -751,68 +756,16 @@ install_nodejs() {
|
||||
}
|
||||
|
||||
install_nodejs_headers() {
|
||||
nodejs_version="$(nodejs_version_exact)"
|
||||
nodejs_headers_tar="$(download_file "https://nodejs.org/download/release/v$nodejs_version/node-v$nodejs_version-headers.tar.gz")"
|
||||
nodejs_headers_tar="$(download_file "https://nodejs.org/download/release/v$(nodejs_version_exact)/node-v$(nodejs_version_exact)-headers.tar.gz")"
|
||||
nodejs_headers_dir="$(dirname "$nodejs_headers_tar")"
|
||||
execute tar -xzf "$nodejs_headers_tar" -C "$nodejs_headers_dir"
|
||||
|
||||
nodejs_headers_include="$nodejs_headers_dir/node-v$nodejs_version/include"
|
||||
nodejs_headers_include="$nodejs_headers_dir/node-v$(nodejs_version_exact)/include"
|
||||
execute_sudo cp -R "$nodejs_headers_include/" "/usr"
|
||||
|
||||
# Also install to node-gyp cache locations for different node-gyp versions
|
||||
# This ensures node-gyp finds headers without downloading them
|
||||
setup_node_gyp_cache "$nodejs_version" "$nodejs_headers_dir/node-v$nodejs_version"
|
||||
}
|
||||
|
||||
setup_node_gyp_cache() {
|
||||
nodejs_version="$1"
|
||||
headers_source="$2"
|
||||
|
||||
# Common node-gyp cache locations
|
||||
cache_locations="
|
||||
$HOME/.node-gyp/$nodejs_version
|
||||
$HOME/.cache/node-gyp/$nodejs_version
|
||||
$HOME/.npm/_cacache/node-gyp/$nodejs_version
|
||||
$current_home/.node-gyp/$nodejs_version
|
||||
$current_home/.cache/node-gyp/$nodejs_version
|
||||
"
|
||||
|
||||
for cache_dir in $cache_locations; do
|
||||
if ! [ -z "$cache_dir" ]; then
|
||||
create_directory "$cache_dir"
|
||||
|
||||
# Copy headers
|
||||
if [ -d "$headers_source/include" ]; then
|
||||
cp -R "$headers_source/include" "$cache_dir/" 2>/dev/null || true
|
||||
fi
|
||||
|
||||
# Create installVersion file (node-gyp expects this)
|
||||
echo "11" > "$cache_dir/installVersion" 2>/dev/null || true
|
||||
|
||||
# For Linux, we don't need .lib files like Windows
|
||||
# but create the directory structure node-gyp expects
|
||||
case "$arch" in
|
||||
x86_64|amd64)
|
||||
create_directory "$cache_dir/lib/x64" 2>/dev/null || true
|
||||
;;
|
||||
aarch64|arm64)
|
||||
create_directory "$cache_dir/lib/arm64" 2>/dev/null || true
|
||||
;;
|
||||
*)
|
||||
create_directory "$cache_dir/lib" 2>/dev/null || true
|
||||
;;
|
||||
esac
|
||||
|
||||
# Set proper ownership for buildkite user
|
||||
if [ "$ci" = "1" ] && [ "$user" = "buildkite-agent" ]; then
|
||||
execute_sudo chown -R "$user:$user" "$cache_dir" 2>/dev/null || true
|
||||
fi
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
bun_version_exact() {
|
||||
print "1.2.17"
|
||||
print "1.2.0"
|
||||
}
|
||||
|
||||
install_bun() {
|
||||
@@ -957,7 +910,7 @@ install_llvm() {
|
||||
bash="$(require bash)"
|
||||
llvm_script="$(download_file "https://apt.llvm.org/llvm.sh")"
|
||||
execute_sudo "$bash" "$llvm_script" "$(llvm_version)" all
|
||||
|
||||
|
||||
# Install llvm-symbolizer explicitly to ensure it's available for ASAN
|
||||
install_packages "llvm-$(llvm_version)-tools"
|
||||
;;
|
||||
@@ -977,8 +930,7 @@ install_llvm() {
|
||||
}
|
||||
|
||||
install_gcc() {
|
||||
if ! [ "$os" = "linux" ] || ! [ "$distro" = "ubuntu" ] || [ -z "$gcc_version" ]
|
||||
then
|
||||
if ! [ "$os" = "linux" ] || ! [ "$distro" = "ubuntu" ] || [ -z "$gcc_version" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user