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:
- tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
- tools/signing/functions
- tools/signing/staticiforme-prepare-cdn-dist-upload
- tools/signing/sync-builder-unsigned-to-local-signed
- tools/signing/upload-update_responses-to-staticiforme
- tools/signing/wait-for-finished-build
Changes:
=====================================
tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo
=====================================
@@ -11,14 +11,14 @@ do
chmod 644 "$tmpfile"
if test "$builder" = 'jb'; then
file="$file.gpg"
-
urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file";)
+
urls=("https://cdn.stagemole.eu/hashes/$SIGNING_PROJECTNAME/$tbb_version-$tbb_version_build/$file";)
else
file="$file.asc"
urls=( \
-
"https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-build$tbb_version_build/$file";
\
-
"https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/$tbb_version-build$tbb_version_build/$file";
\
-
"https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file";
\
-
"https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-build$tbb_version_build/$file";
\
+
"https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version-$tbb_version_build/$file";
\
+
"https://people.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/$tbb_version-$tbb_version_build/$file";
\
+
"https://tb-build-02.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/$file";
\
+
"https://tb-build-03.torproject.org/~$builder/builds/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/$file";
\
)
fi
for url in "${urls[@]}"
=====================================
tools/signing/functions
=====================================
@@ -40,7 +40,7 @@ function generate_config {
"$SIGNING_PROJECTNAME" --target "$tbb_version_type")
echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" > \
"$script_dir/set-config.generated-config"
- local tbb_version_type=$("$rbm" showconf browser \
var/browser_default_channel \
+ local tbb_version_type=$("$rbm" showconf browser var/browser_default_channel
\
--target "$SIGNING_PROJECTNAME")
local tbb_version=$("$rbm" showconf browser var/torbrowser_version \
--target "$SIGNING_PROJECTNAME" --target \
=====================================
tools/signing/staticiforme-prepare-cdn-dist-upload
=====================================
@@ -1,5 +1,6 @@
#!/bin/bash
set -e
+no_generate_config=1
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
source "$script_dir/functions"
=====================================
tools/signing/sync-builder-unsigned-to-local-signed
=====================================
@@ -5,4 +5,4 @@ source "$script_dir/functions"
var_is_defined ssh_host_builder builder_tor_browser_build_dir
-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/"
+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
git commit -m "$tbb_version_type: new version, $tbb_version ($file)"
done
-git add "$tbb_version_type"/download-android-*.json
-git diff --quiet --cached --exit-code || \
- git commit -m "$tbb_version_type: new version, $tbb_version (android)"
+if is_project torbrowser; then
+ git add "$tbb_version_type"/download-android-*.json
+ git diff --quiet --cached --exit-code || \
+ git commit -m "$tbb_version_type: new version, $tbb_version (android)"
+fi
git add "$tbb_version_type"
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
while true
do
- 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"
&& \
+ 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"
&& \
exit 0
echo "$(date -Iseconds): Waiting for build to finish..."
sleep 5m
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/fe816f6219b074f8a1d8fcf392530f61c1c8d6de...ca6a15ebc1e36e7037276f031724d16c8286ce73
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/fe816f6219b074f8a1d8fcf392530f61c1c8d6de...ca6a15ebc1e36e7037276f031724d16c8286ce73
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list -- tor-commits@lists.torproject.org
To unsubscribe send an email to tor-commits-le...@lists.torproject.org
