[Git][tpo/applications/tor-browser-build][main] 2 commits: Bug 41389: Always generate and load set-config.generated-config

11 Mar 2025


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


Commits:
4c29020e by Nicolas Vigier at 2025-03-10T13:44:39+01:00
Bug 41389: Always generate and load set-config.generated-config

- - - - -
810e8e20 by Nicolas Vigier at 2025-03-10T13:44:39+01:00
Bug 41389: Remove set-config.tbb-version

The signing script will now get the version information from rbm config.

- - - - -


12 changed files:

- .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
- .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
- tools/signing/dmg2mar
- tools/signing/functions
- tools/signing/linux-signer-authenticode-signing
- tools/signing/linux-signer-gpg-sign
- tools/signing/linux-signer-rcodesign-sign
- tools/signing/linux-signer-sign-android-apks
- tools/signing/linux-signer-signmars
- tools/signing/set-config
- − tools/signing/set-config.tbb-version
- tools/signing/upload-update_responses-to-staticiforme


Changes:

=====================================
.gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
=====================================
@@ -137,7 +137,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
   - pierov
 - [ ] Ensure all builders have matching builds
 - [ ] On `${STAGING_SERVER}`, ensure updated:
-  - **NOTE** Having a local git branch with `main` as the upstream branch with these values saved means you only need to periodically `git pull --rebase` and update the `set-config.tbb-version` file
+  - **NOTE** Having a local git branch with `main` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
   - [ ] `tor-browser-build` is on the right commit: `git tag -v mb-${MULLVAD_BROWSER_VERSION}-${MULLVAD_BROWSER_BUILD_N} && git checkout mb-${MULLVAD_BROWSER_VERSION}-${MULLVAD_BROWSER_BUILD_N}`
   - [ ] `tor-browser-build/tools/signing/set-config.hosts`
     - `ssh_host_builder`: ssh hostname of machine with unsigned builds
@@ -147,10 +147,6 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
     - `appstoreconnect_api_key_path`: path to json file containing appstoreconnect api key infos
   - [ ] `set-config.update-responses`
     - `update_responses_repository_dir`: directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git`
-  - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
-    - `tbb_version`: mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
-    - `tbb_version_build`: the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
-    - `tbb_version_type`: either `alpha` for alpha releases or `release` for stable releases
 - [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
 - [ ] On `${STAGING_SERVER}` in a separate `screen` session, run do-all-signing script:
   - Run:


=====================================
.gitlab/issue_templates/Release Prep - Tor Browser Alpha.md
=====================================
@@ -192,7 +192,7 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
   - pierov
 - [ ] Ensure all builders have matching builds
 - [ ] On `${STAGING_SERVER}`, ensure updated:
-  - **NOTE** Having a local git branch with `main` as the upstream branch with these values saved means you only need to periodically `git pull --rebase` and update the `set-config.tbb-version` file
+  - **NOTE** Having a local git branch with `main` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
   - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-${TOR_BROWSER_VERSION}-${TOR_BROWSER_BUILD_N} && git checkout tbb-${TOR_BROWSER_VERSION}-${TOR_BROWSER_BUILD_N}`
   - [ ] `tor-browser-build/tools/signing/set-config.hosts`
     - `ssh_host_builder`: ssh hostname of machine with unsigned builds
@@ -202,10 +202,6 @@ Tor Browser Alpha (and Nightly) are on the `main` branch
     - `appstoreconnect_api_key_path`: path to json file containing appstoreconnect api key infos
   - [ ] `set-config.update-responses`
     - `update_responses_repository_dir`: directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git`
-  - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
-    - `tbb_version`: tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
-    - `tbb_version_build`: the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
-    - `tbb_version_type`: either `alpha` for alpha releases or `release` for stable releases
 - [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
 - [ ] On `${STAGING_SERVER}` in a separate `screen` session, run do-all-signing script:
   - Run:


=====================================
tools/signing/dmg2mar
=====================================
@@ -13,10 +13,6 @@ cd "$script_dir/../.."
 
 # some initial checks to make sure directories and file counts are as expected...
 
-version=$(./rbm/rbm showconf browser --target alpha --target $SIGNING_PROJECTNAME-linux-x86_64 var/torbrowser_version)
-test "$version" = "$tbb_version" || \
-  exit_error "Incorrect tor browser version: $version != $tbb_version"
-
 test -d "$signed_version_dir" || \
   exit_error "$signed_version_dir does not exist"
 


=====================================
tools/signing/functions
=====================================
@@ -13,12 +13,6 @@ function var_is_defined {
   done
 }
 
-function check_torbrowser_version_var {
-  local tbver=$("$script_dir/../../rbm/rbm" showconf browser --target "$SIGNING_PROJECTNAME" var/torbrowser_version)
-  test "$tbver" != "$tbb_version" && exit_error "Wrong tbb_version: $tbver != $tbb_version"
-  return 0
-}
-
 function check_update_responses_repository_dir {
   if test -z "$update_responses_repository_dir" || ! test -d "$update_responses_repository_dir"
   then
@@ -36,44 +30,43 @@ function is_project {
 }
 
 function generate_config {
-  p1=$("$rbm" showconf browser var/project-name --target "$SIGNING_PROJECTNAME")
-  p2=$("$rbm" showconf browser var/Project_Name --target "$SIGNING_PROJECTNAME")
-  p3=$("$rbm" showconf browser var/ProjectName --target "$SIGNING_PROJECTNAME")
-  p4=$("$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME" --target "$tbb_version_type")
-  echo 'rbm_not_available=1' > "$script_dir/set-config.generated-config"
-  echo "SIGNING_PROJECTNAMES=(\"$p1\" \"$p2\" \"$p3\" \"$p4\")" >> "$script_dir/set-config.generated-config"
+  local p1=$("$rbm" showconf browser var/project-name --target \
+       "$SIGNING_PROJECTNAME")
+  local p2=$("$rbm" showconf browser var/Project_Name --target \
+             "$SIGNING_PROJECTNAME")
+  local p3=$("$rbm" showconf browser var/ProjectName --target \
+             "$SIGNING_PROJECTNAME")
+  p4=$("$rbm" showconf browser var/display_name --target \
+       "$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 \
+                           --target "$SIGNING_PROJECTNAME")
+  local tbb_version=$("$rbm" showconf browser var/torbrowser_version \
+                      --target "$SIGNING_PROJECTNAME" --target \
+                      "$tbb_version_type")
+  local tbb_version_build=$("$rbm" showconf browser var/torbrowser_build \
+                            --target "$SIGNING_PROJECTNAME" --target \
+                            "$tbb_version_type")
+  for v in tbb_version_type tbb_version tbb_version_build; do
+    echo "$v=$(shell-quote "${!v}")" >> "$script_dir/set-config.generated-config"
+  done
 }
 
 function project-name {
-   if test -n "${rbm_not_available+x}"; then
-     echo "${SIGNING_PROJECTNAMES[0]}"
-   else
-     "$rbm" showconf browser var/project-name --target "$SIGNING_PROJECTNAME"
-   fi
+  echo "${SIGNING_PROJECTNAMES[0]}"
 }
 
 function Project_Name {
-   if test -n "${rbm_not_available+x}"; then
-     echo "${SIGNING_PROJECTNAMES[1]}"
-   else
-     "$rbm" showconf browser var/Project_Name --target "$SIGNING_PROJECTNAME"
-   fi
+  echo "${SIGNING_PROJECTNAMES[1]}"
 }
 
 function ProjectName {
-   if test -n "${rbm_not_available+x}"; then
-     echo "${SIGNING_PROJECTNAMES[2]}"
-   else
-     "$rbm" showconf browser var/ProjectName --target "$SIGNING_PROJECTNAME"
-   fi
+  echo "${SIGNING_PROJECTNAMES[2]}"
 }
 
 function display_name {
-   if test -n "${rbm_not_available+x}"; then
-     echo "${SIGNING_PROJECTNAMES[3]}"
-   else
-     "$rbm" showconf browser var/display_name --target "$SIGNING_PROJECTNAME" --target "$tbb_version_type"
-   fi
+  echo "${SIGNING_PROJECTNAMES[3]}"
 }
 
 


=====================================
tools/signing/linux-signer-authenticode-signing
=====================================
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+no_generate_config=1
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 


=====================================
tools/signing/linux-signer-gpg-sign
=====================================
@@ -1,6 +1,7 @@
 #!/bin/bash
 set -e
 
+no_generate_config=1
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 


=====================================
tools/signing/linux-signer-rcodesign-sign
=====================================
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 set -e
+no_generate_config=1
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
-source "$script_dir/set-config.generated-config"
 # tbb_version_type is used in wrappers/sign-rcodesign, so we export it
 export tbb_version_type
 


=====================================
tools/signing/linux-signer-sign-android-apks
=====================================
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 set -e
+no_generate_config=1
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
-source "$script_dir/set-config.generated-config"
 
 topdir="$script_dir/../.."
 ARCHS="armv7 aarch64 x86 x86_64"


=====================================
tools/signing/linux-signer-signmars
=====================================
@@ -3,6 +3,7 @@
 set -e
 set -u
 
+no_generate_config=1
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 


=====================================
tools/signing/set-config
=====================================
@@ -20,9 +20,11 @@ test "$SIGNING_PROJECTNAME" = 'torbrowser' \
 
 export SIGNING_PROJECTNAME
 
-test -z "${rbm_not_available+x}" && rbm="$script_dir/../../rbm/rbm"
+rbm="$script_dir/../../rbm/rbm"
 
-. "$script_dir/set-config.tbb-version"
+test -z "$no_generate_config" && generate_config
+. "$script_dir/set-config.generated-config"
+export no_generate_config=1
 
 test "$tbb_version_type" = 'release' \
   || test "$tbb_version_type" = 'alpha' \


=====================================
tools/signing/set-config.tbb-version deleted
=====================================
@@ -1,7 +0,0 @@
-# The following 3 lines should be uncommented and updated:
-
-#tbb_version=11.5a4
-#tbb_version_build=1
-#tbb_version_type=alpha
-
-var_is_defined tbb_version tbb_version_build tbb_version_type


=====================================
tools/signing/upload-update_responses-to-staticiforme
=====================================
@@ -4,8 +4,6 @@ script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 source "$script_dir/set-config.update-responses"
 
-check_torbrowser_version_var
-
 update_responses_tar_filename="update-responses-$tbb_version_type-$tbb_version.tar"
 update_responses_tar="$script_dir/../../$SIGNING_PROJECTNAME/$tbb_version_type/update-responses/$update_responses_tar_filename"
 test -f "$update_responses_tar" && \



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/f...

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/f...
You're receiving this email because of your account on gitlab.torproject.org.

    

morgan (＠morgan)

tags

participants (1)