mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Skip 32-bit Linux build in CI or tests

Browse source
This commit is contained in:
Dan Stillman 2023-04-30 06:08:16 -04:00
parent 2dc5eecfac
commit e6776fd922
3 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/build.sh
View file

@ -122,7 +122,7 @@ if [[ $BUILD_MAC == 0 ]] && [[ $BUILD_WIN == 0 ]] && [[ $BUILD_LINUX == 0 ]]; th
usage usage
fi fi
if [[ -z "${ZOTERO_INCLUDE_TESTS:-}" ]] || [[ $ZOTERO_INCLUDE_TESTS == "0" ]]; then if [[ -z "${ZOTERO_TEST:-}" ]] || [[ $ZOTERO_TEST == "0" ]]; then
include_tests=0 include_tests=0
else else
include_tests=1 include_tests=1
@ -779,7 +779,14 @@ fi
# Linux # Linux
if [ $BUILD_LINUX == 1 ]; then if [ $BUILD_LINUX == 1 ]; then
for arch in "i686" "x86_64"; do # Skip 32-bit build in tests
if [ "${ZOTERO_TEST:-}" = "1" ]; then
archs="x86_64"
else
archs="i686 x86_64"
fi
for arch in $archs; do
runtime_path="${LINUX_RUNTIME_PATH_PREFIX}${arch}" runtime_path="${LINUX_RUNTIME_PATH_PREFIX}${arch}"
# Set up directory # Set up directory

23
app/scripts/fetch_xulrunner
View file

@ -378,16 +378,19 @@ if [ $BUILD_LINUX == 1 ]; then
rm -rf firefox rm -rf firefox
curl -O "$DOWNLOAD_URL/linux-i686/en-US/firefox-$GECKO_VERSION.tar.bz2" # Include 32-bit build if not in CI
rm -rf firefox-i686 if [ -z "${CI:-}" ]; then
tar xvf firefox-$GECKO_VERSION.tar.bz2 curl -O "$DOWNLOAD_URL/linux-i686/en-US/firefox-$GECKO_VERSION.tar.bz2"
mv firefox firefox-i686 rm -rf firefox-i686
tar xvf firefox-$GECKO_VERSION.tar.bz2
pushd firefox-i686 mv firefox firefox-i686
modify_omni linux32
popd pushd firefox-i686
modify_omni linux32
rm "firefox-$GECKO_VERSION.tar.bz2" popd
rm "firefox-$GECKO_VERSION.tar.bz2"
fi
curl -O "$DOWNLOAD_URL/linux-x86_64/en-US/firefox-$GECKO_VERSION.tar.bz2" curl -O "$DOWNLOAD_URL/linux-x86_64/en-US/firefox-$GECKO_VERSION.tar.bz2"
rm -rf firefox-x86_64 rm -rf firefox-x86_64

2
test/runtests.sh
View file

@ -164,7 +164,7 @@ if [[ -z "$CI" ]] && ! ps | grep js-build/build.js | grep -v grep > /dev/null; t
echo echo
fi fi
ZOTERO_INCLUDE_TESTS=1 "$ROOT_DIR/app/scripts/dir_build" -q ZOTERO_TEST=1 "$ROOT_DIR/app/scripts/dir_build" -q
makePath FX_PROFILE "$PROFILE" makePath FX_PROFILE "$PROFILE"
MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$Z_EXECUTABLE" -profile "$FX_PROFILE" \ MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$Z_EXECUTABLE" -profile "$FX_PROFILE" \