import UBI nodejs-18.20.8-1.module+el8.10.0+23091+f8fc3a53
This commit is contained in:
parent
d855e66b02
commit
96ab9eacb4
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,5 +1,5 @@
|
||||
SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
||||
SOURCES/icu4c-74_2-src.tgz
|
||||
SOURCES/node-v18.20.6-stripped.tar.gz
|
||||
SOURCES/undici-5.28.5.tar.gz
|
||||
SOURCES/node-v18.20.8-stripped.tar.gz
|
||||
SOURCES/undici-5.29.0.tar.gz
|
||||
SOURCES/wasi-sdk-11.0-linux.tar.gz
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
164f7f39841415284b0280a648c43bd7ea1615ac SOURCES/cjs-module-lexer-1.2.2.tar.gz
|
||||
43a8d688a3a6bc8f0f8c5e699d0ef7a905d24314 SOURCES/icu4c-74_2-src.tgz
|
||||
838d4f6468dbc644da2f162027daf8f6f02187f0 SOURCES/node-v18.20.6-stripped.tar.gz
|
||||
ccd4e9c2e825305395469f4a1442eee55d23d54d SOURCES/undici-5.28.5.tar.gz
|
||||
c4f349faccf03053a10c5578abce5250e9e63048 SOURCES/node-v18.20.8-stripped.tar.gz
|
||||
8e1758afbe2d4b67f1fa11d67a800e83449830dd SOURCES/undici-5.29.0.tar.gz
|
||||
ff114dd45b4efeeae7afe4621bfc6f886a475b4b SOURCES/wasi-sdk-11.0-linux.tar.gz
|
||||
|
||||
@ -3,30 +3,11 @@ From: rpm-build <rpm-build>
|
||||
Date: Tue, 30 May 2023 13:12:35 +0200
|
||||
Subject: [PATCH] Disable running gyp on shared deps
|
||||
|
||||
Signed-off-by: rpm-build <rpm-build>
|
||||
---
|
||||
Makefile | 2 +-
|
||||
node.gyp | 17 -----------------
|
||||
2 files changed, 1 insertion(+), 18 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 0be0659..3c44201 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -169,7 +169,7 @@ with-code-cache test-code-cache:
|
||||
$(warning '$@' target is a noop)
|
||||
|
||||
out/Makefile: config.gypi common.gypi node.gyp \
|
||||
- deps/uv/uv.gyp deps/llhttp/llhttp.gyp deps/zlib/zlib.gyp \
|
||||
+ deps/llhttp/llhttp.gyp \
|
||||
deps/simdutf/simdutf.gyp deps/ada/ada.gyp \
|
||||
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
|
||||
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
|
||||
diff --git a/node.gyp b/node.gyp
|
||||
index cf52281..c33b57b 100644
|
||||
--- a/node.gyp
|
||||
+++ b/node.gyp
|
||||
@@ -430,23 +430,6 @@
|
||||
@@ -438,23 +438,6 @@
|
||||
],
|
||||
},
|
||||
],
|
||||
|
||||
60
SOURCES/test-runner.sh
Executable file
60
SOURCES/test-runner.sh
Executable file
@ -0,0 +1,60 @@
|
||||
#!/bin/bash
|
||||
|
||||
NODE_BIN="$1"
|
||||
PARENT_TEST_FOLDER="$2"
|
||||
TEST_LIST_FILE="$3"
|
||||
|
||||
# At most 10 min per test
|
||||
TIMEOUT_DURATION=600
|
||||
# Exit code
|
||||
FINAL_RESULT=0
|
||||
ARCH=$(uname -m)
|
||||
|
||||
echo "Started test run:"
|
||||
# Run the list of test
|
||||
while IFS= read -r test_line; do
|
||||
# ignore commented lines
|
||||
if [[ "$test_line" =~ ^# ]]; then
|
||||
continue
|
||||
fi
|
||||
# If test has specified ARCH which it should be skipped
|
||||
# Extract it
|
||||
TEST_PATH=$(echo "$test_line" | awk '{print $1}')
|
||||
IGNORE_ARCHES=$(echo "$test_line" |\
|
||||
awk '{for (i=2; i<=NF; i++) printf "%s ", $i; print ""}')
|
||||
|
||||
# Skip test for specified ARCH
|
||||
for ARCH_IGNORE in $IGNORE_ARCHES; do
|
||||
if [[ "$ARCH_IGNORE" == "$ARCH" ]]; then
|
||||
continue 2
|
||||
fi
|
||||
done
|
||||
|
||||
# Construct test path
|
||||
TEST_SCRIPT="$PARENT_TEST_FOLDER/$TEST_PATH"
|
||||
|
||||
if [ ! -f "$TEST_SCRIPT" ]; then
|
||||
echo "Test script not found: $TEST_SCRIPT"
|
||||
continue
|
||||
fi
|
||||
|
||||
TEST_OUTPUT=$(timeout "$TIMEOUT_DURATION" "$NODE_BIN" "$TEST_SCRIPT" 2>&1)
|
||||
TEST_RESULT=$?
|
||||
|
||||
# Handle test result
|
||||
if [ $TEST_RESULT -ne 0 ]; then
|
||||
FINAL_RESULT=1
|
||||
if [ $TEST_RESULT -eq 124 ]; then
|
||||
echo "Test timed out: $TEST_SCRIPT"
|
||||
else
|
||||
echo "Test failed: $TEST_SCRIPT"
|
||||
fi
|
||||
echo "Test failure message:"
|
||||
echo "$TEST_OUTPUT"
|
||||
fi
|
||||
done < "$TEST_LIST_FILE"
|
||||
|
||||
if [ $FINAL_RESULT -eq 0 ]; then
|
||||
echo "All tests succesfully passed."
|
||||
fi
|
||||
exit $FINAL_RESULT
|
||||
3839
SOURCES/test-should-pass.txt
Normal file
3839
SOURCES/test-should-pass.txt
Normal file
File diff suppressed because it is too large
Load Diff
@ -30,7 +30,7 @@
|
||||
# This is used by both the nodejs package and the npm subpackage that
|
||||
# has a separate version - the name is special so that rpmdev-bumpspec
|
||||
# will bump this rather than adding .1 to the end.
|
||||
%global baserelease 2
|
||||
%global baserelease 1
|
||||
|
||||
%{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
%global nodejs_epoch 1
|
||||
%global nodejs_major 18
|
||||
%global nodejs_minor 20
|
||||
%global nodejs_patch 6
|
||||
%global nodejs_patch 8
|
||||
%global nodejs_abi %{nodejs_major}.%{nodejs_minor}
|
||||
# nodejs_soversion - from NODE_MODULE_VERSION in src/node_version.h
|
||||
%global nodejs_soversion 108
|
||||
@ -111,7 +111,7 @@
|
||||
# simduft from deps/simdutf/simdutf.h
|
||||
%global simduft_major 5
|
||||
%global simduft_minor 6
|
||||
%global simduft_patch 0
|
||||
%global simduft_patch 4
|
||||
%global simduft_version %{simduft_major}.%{simduft_minor}.%{simduft_patch}
|
||||
|
||||
# ada from deps/ada/ada.h
|
||||
@ -139,7 +139,7 @@
|
||||
%global npm_release %{nodejs_epoch}.%{nodejs_major}.%{nodejs_minor}.%{nodejs_patch}.%{nodejs_release}
|
||||
|
||||
# Node.js 16.9.1 and later comes with an experimental package management tool
|
||||
%global corepack_version 0.22.0
|
||||
%global corepack_version 0.32.0
|
||||
|
||||
# uvwasi - from deps/uvwasi/include/uvwasi.h
|
||||
%global uvwasi_version 0.0.19
|
||||
@ -190,10 +190,12 @@ Source101: cjs-module-lexer-1.2.2.tar.gz
|
||||
Source102: https://github.com/WebAssembly/wasi-sdk/archive/wasi-sdk-11/wasi-sdk-11.0-linux.tar.gz
|
||||
|
||||
# Version: jq '.version' deps/undici/src/package.json
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.28.5.tar.gz
|
||||
# Adjustments: rm -f undici-5.28.5/lib/llhttp/llhttp*.wasm
|
||||
# Original: https://github.com/nodejs/undici/archive/refs/tags/v5.29.0.tar.gz
|
||||
# Adjustments: rm -f undici-5.29.0/lib/llhttp/llhttp*.wasm
|
||||
# Build uses alpine image, see alpine for sources for wasi-sdk
|
||||
Source111: undici-5.28.5.tar.gz
|
||||
Source111: undici-5.29.0.tar.gz
|
||||
Source300: test-runner.sh
|
||||
Source301: test-should-pass.txt
|
||||
|
||||
# Disable running gyp on bundled deps we don't use
|
||||
Patch1: 0001-Disable-running-gyp-on-shared-deps.patch
|
||||
@ -585,6 +587,13 @@ install -Dpm0644 -t %{buildroot}%{icudatadir} deps/icu/source/converted/*
|
||||
|
||||
|
||||
%check
|
||||
#run unit test that should pass from list
|
||||
LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
|
||||
bash %{SOURCE300} \
|
||||
%{buildroot}/%{_bindir}/node \
|
||||
%{_builddir}/node-v%{nodejs_version}/test/ \
|
||||
%{SOURCE301}
|
||||
|
||||
# Fail the build if the versions don't match
|
||||
%{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.node, '%{nodejs_version}')"
|
||||
%{buildroot}/%{_bindir}/node -e "require('assert').equal(process.versions.v8.replace(/-node\.\d+$/, ''), '%{v8_version}')"
|
||||
@ -680,6 +689,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} \
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon May 05 2025 Tomas Juhasz <tjuhasz@redhat.com> - 1:18.20.8-1
|
||||
- Update to version 18.20.8
|
||||
Resolves: RHEL-83531 RHEL-89597
|
||||
|
||||
* Thu Mar 06 2025 Andrei Radchenko <aradchen@redhat.com> - 1:18.20.6-2
|
||||
- Disable npm's update-notifier
|
||||
Resolves: RHEL-81075
|
||||
|
||||
Loading…
Reference in New Issue
Block a user