tools/signing/linux-signer-gpg-sign

@@ -4,6 +4,8 @@ set -e
 script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "$script_dir/functions"
 
+test "$tbb_version_type" = "alpha" && export GPG_NEWSUBKEY=1
+
 cd ~/"$SIGNING_PROJECTNAME-$tbb_version"
 
 test -n "$GPG_PASS" || read -sp "Enter gpg passphrase: " GPG_PASS

tools/signing/machines-setup/sudoers.d/sign-gpg

-Defaults>signing-gpg env_keep += SIGNING_PROJECTNAME
+Defaults>signing-gpg env_keep += "SIGNING_PROJECTNAME GPG_NEWSUBKEY"
 %signing ALL = (signing-gpg) NOPASSWD: /signing/tor-browser-build/tools/signing/wrappers/sign-gpg

tools/signing/wrappers/sign-gpg

@@ -11,4 +11,6 @@ if test $(whoami) != 'signing-gpg'; then
   exit 1
 fi
 
-exec gpg --homedir /home/signing-gpg/.gnupg -absu 0xe53d989a9e2d47bf! --batch --no-tty -o- --passphrase-fd 0 -- "$1"
+gpg_subkey='0xe53d989a9e2d47bf!'
+test -n "$GPG_NEWSUBKEY" && gpg_subkey='0x157432CF78A65729!'
+exec gpg --homedir /home/signing-gpg/.gnupg -absu "$gpg_subkey" --batch --no-tty -o- --passphrase-fd 0 -- "$1"