Unverified Commit 1c24b4a9 authored by boklm's avatar boklm
Browse files

Bug 41286: Update the deploy update scripts to optinally take an override hash

parent ae68fd52

.gitlab/issue_templates/Release Prep - Tor Browser Legacy.md

+2 −30
Changes for .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md: 2 added lines, 30 removed lines.
Original line number Diff line number Diff line
@@ -268,37 +268,9 @@ popd 
        git show -s --format=%H

        ```

  - On `staticiforme.torproject.org`, deploy new update responses:

    - **NOTE**: for now this is a bit janky, we should somehow update the workflow to be a bit less hacky

    - [ ] Edit an existing `deploy_update_responses-release.sh` script in your `HOME` directory with the newly pushed commit hash

      - **example**: (hash: `d938943`)

    - [ ] Enable update responses, passing the commit hash as argument (replace $commit):

      ```bash

        #!/bin/bash

        set -e



        echo "Deploying version 14.0"

        echo "update_responses_commit: d938943"



        cd "/srv/aus1-master.torproject.org/htdocs/torbrowser"

        git fetch

        changed_files="$(git diff --name-only HEAD d938943)"

        if echo "$changed_files" | grep -qv "release"

        then

          echo >&2 "Error: checking out new update_response_commit will changes"

          echo >&2 "some files outside of the release directory:"

          echo "$changed_files" | grep -v "release" >&2

          echo >&2 "--"

          echo >&2 "If this is really what you want to do, edit this script to"

          echo >&2 "remove the line 'exit 1' and run it again."

          echo >&2 "See tor-browser-build#41168 for more details."

          exit 1

        fi

        git checkout "d938943"



        static-update-component aus1.torproject.org

        ```

    - [ ] Enable update responses:

      ```bash

      sudo -u tb-release ./deploy_update_responses-release.sh

      sudo -u tb-release ./deploy_update_responses-release.sh $commit

      ```



</details>

tools/signing/upload-update_responses-to-staticiforme

+12 −4
Changes for tools/signing/upload-update_responses-to-staticiforme: 12 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -55,12 +55,20 @@ cat << EOF > "$deploy_script" 
#!/bin/bash

set -e



echo "Deploying version $tbb_version"

echo "update_responses_commit: $update_responses_commit"

if test "\$#" -gt 1; then

  echo >&2 "Wrong number of arguments"

  exit 2

fi



commit=$update_responses_commit

test "\$#" -eq 1 && commit="\$1"



test "\$#" -eq 0 && echo "Deploying version $tbb_version"

echo "update_responses_commit: \$commit"



cd "$update_dir"

git fetch

changed_files="\$(git diff --name-only HEAD $update_responses_commit)"

changed_files="\$(git diff --name-only HEAD \$commit)"

if echo "\$changed_files" | grep -qv "$tbb_version_type"

then

  echo >&2 "Error: checking out new update_response_commit will changes"
@@ -72,7 +80,7 @@ then 
  echo >&2 "See tor-browser-build#41168 for more details."

  exit 1

fi

git checkout "$update_responses_commit"

git checkout "\$commit"



static-update-component aus1.torproject.org

EOF