[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41678: Use set -euo pipefail by default.

Title: GitLab

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:

Changes:

  • projects/android-sdk/config
    ... ... @@ -7,7 +7,7 @@ var:
    7 7 
         mkdir -p /var/tmp/dist
    8 8 
         tar -C /var/tmp/dist -xf $rootdir/[% c("sdk_tarfile") %]
    9 9 
         export ANDROID_HOME=/var/tmp/dist/[% project %]
    10 
    -    [[ -n "${ANDROID_NDK_HOME}" ]] && ln -s $ANDROID_NDK_HOME $ANDROID_HOME/ndk/[% pc("android-ndk", "version") %]
    10 
    +    [[ -n "${ANDROID_NDK_HOME:-}" ]] && ln -s "${ANDROID_NDK_HOME:-}" "$ANDROID_HOME/ndk/[% pc('android-ndk', 'version') %]"
    11 11 
         export PATH=$PATH:$ANDROID_HOME/build-tools/[% c("version") %]
    12 12 
       google_repo: https://dl.google.com/android/repository
    13 13 
       android_release_dir: android-16

  • projects/browser/build.android
    ... ... @@ -94,7 +94,7 @@ function generate_apk {
    94 94 
       # flag in the manifest.
    95 95 
       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
    96 96
    97 
    -  local unsign_patch=$3
    97 
    +  local unsign_patch=${3:-}
    98 98 
       if [ -n "$unsign_patch" ]; then
    99 99 
         bsdiff $final_apk $aligned_apk $unsign_patch
    100 100 
       fi

  • projects/cbindgen/build
    ... ... @@ -6,7 +6,7 @@ mkdir -p $distdir/[% project %]
    6 6 
     tar -C /var/tmp/dist -xf $rootdir/[% c('input_files_by_name/rust') %]
    7 7 
     export PATH="/var/tmp/dist/rust/bin:$PATH"
    8 8 
     [% IF c("var/linux") -%]
    9 
    -  export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:$LD_LIBRARY_PATH"
    9 
    +  export LD_LIBRARY_PATH="/var/tmp/dist/rust/lib:${LD_LIBRARY_PATH:-}"
    10 10 
     [% END -%]
    11 11 
     mkdir -p /var/tmp/build
    12 12 
     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
    48 48 
         # Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build
    49 49 
         # breakage in Rust code. It seems that environment variable is not passed
    50 50 
         # down properly in that case. Thus, we set it here in the build script.
    51 
    -    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/[% c("var/crosstarget") %]/pkgconfig"
    51 
    +    export PKG_CONFIG_PATH="/usr/lib/[% c('var/crosstarget') %]/pkgconfig:${PKG_CONFIG_PATH:-}"
    52 52 
       [% END -%]
    53 53 
       [% IF c("var/dev_artifacts") -%]
    54 54 
         python3 -m pip install $rootdir/[% c('input_files_by_name/python-zstandard') %]/*.whl
    ... ... @@ -267,10 +267,7 @@ RBM_TB_EOF
    267 267 
     cd $distdir
    268 268
    269 269 
     [% IF c("var/linux") -%]
    270 
    -  [% IF c("var/linux-cross") -%]
    271 
    -    CROSS_PREFIX=[% c("var/crosstarget") %]-
    272 
    -  [% END -%]
    273 
    -
    270 
    +  CROSS_PREFIX=[% IF c("var/linux-cross") %][% c("var/crosstarget") %]-[% END %]
    274 271 
       OBJCOPY="${CROSS_PREFIX}objcopy"
    275 272 
       STRIP="${CROSS_PREFIX}strip"
    276 273

  • projects/gcc-cross/build
    1 
    -#!/bin/sh
    1 
    +#!/bin/bash
    2 2 
     [% c("var/set_default_env") -%]
    3 3 
     mkdir -p /var/tmp/build
    4 4 
     distdir=/var/tmp/dist/[% c("var/distdir") %]

  • projects/gcc/build
    1 
    -#!/bin/sh
    1 
    +#!/bin/bash
    2 2 
     [% c("var/set_default_env") -%]
    3 3 
     mkdir -p /var/tmp/build
    4 4

  • projects/go/build
    ... ... @@ -24,13 +24,13 @@ cd /var/tmp/dist/go/src
    24 24 
     [% ELSIF c("var/macos") -%]
    25 25 
       unset LDFLAGS
    26 26 
       rm -Rf $clangdir/helpers
    27 
    -  export CC="$clangdir/bin/clang [% c("var/FLAGS") %]"
    27 
    +  export CC="$clangdir/bin/clang [% c('var/FLAGS') %]"
    28 28 
       # Create a cc-for-target script that closes over CC, CFLAGS, and LDFLAGS.
    29 29 
       # Go's CC_FOR_TARGET only allows a command name, not a command with arguments.
    30 30 
       # https://github.com/golang/go/issues/15457
    31 31 
       CC_FOR_TARGET="$(pwd)/cc-for-target"
    32 32 
       echo "#!/bin/sh" > "$CC_FOR_TARGET"
    33 
    -  echo "exec $CC $CFLAGS $LDFLAGS \"\$@\"" >> "$CC_FOR_TARGET"
    33 
    +  echo "exec $CC \"\$@\"" >> "$CC_FOR_TARGET"
    34 34 
       chmod +x "$CC_FOR_TARGET"
    35 35 
       CGO_ENABLED=1 CC_FOR_TARGET="$CC_FOR_TARGET" CC= CFLAGS= LDFLAGS= ./make.bash
    36 36 
     [% ELSIF c("var/windows") -%]

  • projects/tor/build
    ... ... @@ -109,10 +109,7 @@ cd $distdir
    109 109 
     [% END %]
    110 110
    111 111 
     [% IF c("var/linux") %]
    112 
    -  [% IF c("var/linux-cross") -%]
    113 
    -    CROSS_PREFIX=[% c("var/crosstarget") %]-
    114 
    -  [% END -%]
    115 
    -
    112 
    +  CROSS_PREFIX=[% IF c("var/linux-cross") %][% c("var/crosstarget") %]-[% END %]
    116 113 
       OBJCOPY="${CROSS_PREFIX}objcopy"
    117 114 
       STRIP="${CROSS_PREFIX}strip"
    118 115

  • rbm
    1 
    -Subproject commit 8885e87c2def8fe2f85c76fd8df0226fff99f9a4
    1 
    +Subproject commit 36608a50ccf8feedcd03eb846c606718f5ef2d6b

  • rbm.conf
    ... ... @@ -255,8 +255,11 @@ var:
    255 255 
       sign_build: '[% ENV.RBM_SIGN_BUILD %]'
    256 256 
       sign_build_gpg_opts: '[% ENV.RBM_GPG_OPTS %]'
    257 257
    258 
    +  set_default_env_shell_flags: 'set -euo pipefail'
    258 259 
       set_default_env: |
    259 
    -    set -e
    260 
    +    [% IF !c("getting_id") -%]
    261 
    +    [% c('var/set_default_env_shell_flags') %]
    262 
    +    [% END -%]
    260 263 
         [% FOREACH env = c('ENV') -%]
    261 264 
         export [% env.key %]="[% env.value %]"
    262 265 
         [% END -%]

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/cb3b1bef354bdb59d5fe858646465b4031878d12 at 1769596969 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx