Commit 181c3a6a authored by boklm's avatar boklm Committed by morgan
Browse files

Bug 41389: tbb_version_build is now `buildN` instead of `N`. 

Fixup for 810e8e20.
parent 5752074b

tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo

+5 −5
Changes for tools/signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -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/sync-builder-unsigned-to-local-signed

+1 −1
Changes for tools/signing/sync-builder-unsigned-to-local-signed: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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/wait-for-finished-build

+1 −1
Changes for tools/signing/wait-for-finished-build: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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