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

[tor-commits] [Git][tpo/applications/tor-browser-build][main] 4 commits: Bug 41389: Remove `\` mistakenly added in the middle of a line.

Title: GitLab

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

  • 5752074b
    by Nicolas Vigier at 2025-03-17T19:46:58+00:00 
    Bug 41389: Remove `\` mistakenly added in the middle of a line.

Fixup for 810e8e207b5e4f568c25c3b3817873fa11684606.
  • 181c3a6a
    by Nicolas Vigier at 2025-03-17T19:46:58+00:00 
    Bug 41389: tbb_version_build is now `buildN` instead of `N`.

Fixup for 810e8e207b5e4f568c25c3b3817873fa11684606.
  • ecd7d21b
    by Nicolas Vigier at 2025-03-17T19:46:58+00:00 
    Bug 41389: don't generate config in staticiforme-prepare-cdn-dist-upload

staticiforme-prepare-cdn-dist-upload is being run on staticiforme, so
configuration should not be generated from rbm.

Fixup for 4c29020e99aac0d2a06b6ca9b9a3b17e04c7f3de.
  • ca6a15eb
    by Nicolas Vigier at 2025-03-17T19:46:58+00:00 
    Bug 41394: Don't try to add download-android-*.json files for Mullvad Browser

6 changed files:

Changes:

  • tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
    ... ... @@ -11,14 +11,14 @@ do
    11 11 
         chmod 644 "$tmpfile"
    12 12 
         if test "$builder" = 'jb'; then
    13 13 
           file="$file.gpg"
    14 
    -      urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file")
    14 
    +      urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-$tbb_version_build/$file")
    15 15 
         else
    16 16 
           file="$file.asc"
    17 17 
           urls=( \
    18 
    -        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file" \
    19 
    -        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/$tbb_version-build$tbb_version_build/$file" \
    20 
    -        "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
    21 
    -        "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file" \
    18 
    +        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-$tbb_version_build/$file" \
    19 
    +        "https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/$tbb_version-$tbb_version_build/$file" \
    20 
    +        "https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/$file" \
    21 
    +        "https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/$file" \
    22 22 
           )
    23 23 
         fi
    24 24 
         for url in "${urls[@]}"

  • tools/signing/functions
    ... ... @@ -40,7 +40,7 @@ function generate_config {
    40 40 
            "$SIGNING_PROJECTNAME"  --target "$tbb_version_type")
    41 41 
       echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \
    42 42 
            "$script_dir/set-config.generated-config"
    43 
    -  local tbb_version_type=$("$rbm" showconf browser \ var/browser_default_channel \
    43 
    +  local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel \
    44 44 
                                --target "$SIGNING_PROJECTNAME")
    45 45 
       local tbb_version=$("$rbm" showconf browser var/torbrowser_version \
    46 46 
                           --target "$SIGNING_PROJECTNAME" --target \

  • tools/signing/staticiforme-prepare-cdn-dist-upload
    1 1 
     #!/bin/bash
    2 2 
     set -e
    3 
    +no_generate_config=1
    3 4 
     script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
    4 5 
     source "$script_dir/functions"
    5 6

  • tools/signing/sync-builder-unsigned-to-local-signed
    ... ... @@ -5,4 +5,4 @@ source "$script_dir/functions"
    5 5
    6 6 
     var_is_defined ssh_host_builder builder_tor_browser_build_dir
    7 7
    8 
    -rsync $rsync_options "$ssh_host_builder:$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/" "$signed_version_dir/"
    8 
    +rsync $rsync_options "$ssh_host_builder:$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/" "$signed_version_dir/"

  • tools/signing/upload-update_responses-to-staticiforme
    ... ... @@ -56,9 +56,11 @@ do
    56 56 
         git commit -m "$tbb_version_type: new version, $tbb_version ($file)"
    57 57 
     done
    58 58
    59 
    -git add "$tbb_version_type"/download-android-*.json
    60 
    -git diff --quiet  --cached --exit-code || \
    61 
    -  git commit -m "$tbb_version_type: new version, $tbb_version (android)"
    59 
    +if is_project torbrowser; then
    60 
    +  git add "$tbb_version_type"/download-android-*.json
    61 
    +  git diff --quiet  --cached --exit-code || \
    62 
    +    git commit -m "$tbb_version_type: new version, $tbb_version (android)"
    63 
    +fi
    62 64
    63 65 
     git add "$tbb_version_type"
    64 66 
     git diff --quiet  --cached --exit-code || \

  • tools/signing/wait-for-finished-build
    ... ... @@ -14,7 +14,7 @@ var_is_defined ssh_host_builder builder_tor_browser_build_dir
    14 14
    15 15 
     while true
    16 16 
     do
    17 
    -  ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \
    17 
    +  ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \
    18 18 
         exit 0
    19 19 
       echo "$(date -Iseconds): Waiting for build to finish..."
    20 20 
       sleep 5m

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

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