Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cb3b1bef by Pier Angelo Vendrame at 2026-01-28T11:41:16+01:00 Bug 41678: Use set -euo pipefail by default. Before this change, we were using only `set -e`, but since we use pipes e.g., when detecting Android dependencies (with tee), it makes sense to add also pipefail. - - - - - 10 changed files: - projects/android-sdk/config - projects/browser/build.android - projects/cbindgen/build - projects/firefox/build - projects/gcc-cross/build - projects/gcc/build - projects/go/build - projects/tor/build - rbm - rbm.conf Changes: ===================================== projects/android-sdk/config ===================================== @@ -7,7 +7,7 @@ var: mkdir -p /var/tmp/dist tar -C /var/tmp/dist -xf $rootdir/[% c("sdk_tarfile") %] export ANDROID_HOME=/var/tmp/dist/[% project %] - [[ -n "${ANDROID_NDK_HOME}" ]] && ln -s $ANDROID_NDK_HOME $ANDROID_HOME/ndk/[% pc("android-ndk", "version") %] + [[ -n "${ANDROID_NDK_HOME:-}" ]] && ln -s "${ANDROID_NDK_HOME:-}" "$ANDROID_HOME/ndk/[% pc('android-ndk', 'version') %]" export PATH=$PATH:$ANDROID_HOME/build-tools/[% c("version") %] google_repo: https://dl.google.com/android/repository android_release_dir: android-16 ===================================== projects/browser/build.android ===================================== @@ -94,7 +94,7 @@ function generate_apk { # flag in the manifest. apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $rootdir/android-qa.keystore --out $final_apk --in $aligned_apk --ks-key-alias androidqakey --key-pass pass:android --ks-pass pass:android - local unsign_patch=$3 + local unsign_patch=${3:-} if [ -n "$unsign_patch" ]; then bsdiff $final_apk $aligned_apk $unsign_patch fi ===================================== projects/cbindgen/build ===================================== @@ -6,7 +6,7 @@ mkdir -p $distdir/[% project %] tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %] export PATH="/var/tmp/dist/rust/bin:$PATH" [% IF c("var/linux") -%] - export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:${LD_LIBRARY_PATH:-}" [% END -%] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.[% c('compress_tar') %] ===================================== projects/firefox/build ===================================== @@ -48,7 +48,7 @@ export PATH="/var/tmp/dist/rust/bin:/var/tmp/dist/cbindgen:/var/tmp/dist/node/bi # Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build # breakage in Rust code. It seems that environment variable is not passed # down properly in that case. Thus, we set it here in the build script. - export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/[% c("var/crosstarget") %]/pkgconfig" + export PKG_CONFIG_PATH="/usr/lib/[% c('var/crosstarget') %]/pkgconfig:${PKG_CONFIG_PATH:-}" [% END -%] [% IF c("var/dev_artifacts") -%] python3 -m pip install $rootdir/[% c('input_files_by_name/python-zstandard') %]/*.whl @@ -267,10 +267,7 @@ RBM_TB_EOF cd $distdir [% IF c("var/linux") -%] - [% IF c("var/linux-cross") -%] - CROSS_PREFIX=[% c("var/crosstarget") %]- - [% END -%] - + CROSS_PREFIX=[% IF c("var/linux-cross") %][% c("var/crosstarget") %]-[% END %] OBJCOPY="${CROSS_PREFIX}objcopy" STRIP="${CROSS_PREFIX}strip" ===================================== projects/gcc-cross/build ===================================== @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash [% c("var/set_default_env") -%] mkdir -p /var/tmp/build distdir=/var/tmp/dist/[% c("var/distdir") %] ===================================== projects/gcc/build ===================================== @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash [% c("var/set_default_env") -%] mkdir -p /var/tmp/build ===================================== projects/go/build ===================================== @@ -24,13 +24,13 @@ cd /var/tmp/dist/go/src [% ELSIF c("var/macos") -%] unset LDFLAGS rm -Rf $clangdir/helpers - export CC="$clangdir/bin/clang [% c("var/FLAGS") %]" + export CC="$clangdir/bin/clang [% c('var/FLAGS') %]" # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS. # Go's CC_FOR_TARGET only allows a command name, not a command with arguments. # https://github.com/golang/go/issues/15457 CC_FOR_TARGET="$(pwd)/cc-for-target" echo "#!/bin/sh" > "$CC_FOR_TARGET" - echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET" + echo "exec $CC \"\$@\"" >> "$CC_FOR_TARGET" chmod +x "$CC_FOR_TARGET" CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash [% ELSIF c("var/windows") -%] ===================================== projects/tor/build ===================================== @@ -109,10 +109,7 @@ cd $distdir [% END %] [% IF c("var/linux") %] - [% IF c("var/linux-cross") -%] - CROSS_PREFIX=[% c("var/crosstarget") %]- - [% END -%] - + CROSS_PREFIX=[% IF c("var/linux-cross") %][% c("var/crosstarget") %]-[% END %] OBJCOPY="${CROSS_PREFIX}objcopy" STRIP="${CROSS_PREFIX}strip" ===================================== rbm ===================================== @@ -1 +1 @@ -Subproject commit 8885e87c2def8fe2f85c76fd8df0226fff99f9a4 +Subproject commit 36608a50ccf8feedcd03eb846c606718f5ef2d6b ===================================== rbm.conf ===================================== @@ -255,8 +255,11 @@ var: sign_build: '[% ENV.RBM_SIGN_BUILD %]' sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]' + set_default_env_shell_flags: 'set -euo pipefail' set_default_env: | - set -e + [% IF !c("getting_id") -%] + [% c('var/set_default_env_shell_flags') %] + [% END -%] [% FOREACH env = c('ENV') -%] export [% env.key %]="[% env.value %]" [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/cb... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/cb... You're receiving this email because of your account on gitlab.torproject.org.