Skip to content

Commit f4a685a

Browse files
committed
Fix arch detection in v8 build
1 parent f0f1a20 commit f4a685a

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/build-test.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,14 @@ jobs:
5555
cd "$(mktemp -d)"
5656
5757
ARCH=$(uname -m)
58+
if [[ "$ARCH" == "x86_64" ]]; then
59+
V8CONFIG="x64.release"
60+
elif [[ "$ARCH" == "arm64" ]]; then
61+
V8CONFIG="arm64.release"
62+
else
63+
echo "Unknown architecture: $ARCH" >&2
64+
exit 1
65+
fi
5866
fetch --nohooks --no-history v8
5967
cd v8
6068
git fetch --tag origin refs/tags/${{ matrix.v8-versions }}
@@ -63,17 +71,17 @@ jobs:
6371
6472
# Setup GN
6573
# Warnings are no errors - @see https://issues.chromium.org/issues/42203398#comment9
66-
tools/dev/v8gen.py -vv ${ARCH}.release -- is_component_build=true use_custom_libcxx=false treat_warnings_as_errors=false
74+
tools/dev/v8gen.py -vv $V8CONFIG -- is_component_build=true use_custom_libcxx=false treat_warnings_as_errors=false
6775
6876
# Build
69-
ninja -C out.gn/${ARCH}.release/
77+
ninja -C out.gn/$V8CONFIG/
7078
7179
if [[ "${{ runner.os }}" == "macOS" ]]; then
7280
LIB_EXT=dylib
7381
else
7482
LIB_EXT=so
7583
fi
76-
cp out.gn/${ARCH}.release/lib*.${LIB_EXT} out.gn/${ARCH}.release/*_blob.bin out.gn/${ARCH}.release/icudtl.dat /opt/v8/self-built/lib/
84+
cp out.gn/$V8CONFIG/lib*.${LIB_EXT} out.gn/$V8CONFIG/*_blob.bin out.gn/$V8CONFIG/icudtl.dat /opt/v8/self-built/lib/
7785
cp -R include/* /opt/v8/self-built/include/
7886
7987
# Go back to origin

0 commit comments

Comments
 (0)