[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Bug 41286: Update the deploy update scripts to optinally take an override hash

Title: GitLab

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

Commits:

  • 1c24b4a9
    by Nicolas Vigier at 2024-10-30T17:48:34+01:00 
    Bug 41286: Update the deploy update scripts to optinally take an override hash

2 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md
    ... ... @@ -268,37 +268,9 @@ popd
    268 268 
             git show -s --format=%H
    269 269 
             ```
    270 270 
       - On `staticiforme.torproject.org`, deploy new update responses:
    271 
    -    - **NOTE**: for now this is a bit janky, we should somehow update the workflow to be a bit less hacky
    272 
    -    - [ ] Edit an existing `deploy_update_responses-release.sh` script in your `HOME` directory with the newly pushed commit hash
    273 
    -      - **example**: (hash: `d938943`)
    274 
    -        ```bash
    275 
    -        #!/bin/bash
    276 
    -        set -e
    277 
    -
    278 
    -        echo "Deploying version 14.0"
    279 
    -        echo "update_responses_commit: d938943"
    280 
    -
    281 
    -        cd "/srv/aus1-master.torproject.org/htdocs/torbrowser"
    282 
    -        git fetch
    283 
    -        changed_files="$(git diff --name-only HEAD d938943)"
    284 
    -        if echo "$changed_files" | grep -qv "release"
    285 
    -        then
    286 
    -          echo >&2 "Error: checking out new update_response_commit will changes"
    287 
    -          echo >&2 "some files outside of the release directory:"
    288 
    -          echo "$changed_files" | grep -v "release" >&2
    289 
    -          echo >&2 "--"
    290 
    -          echo >&2 "If this is really what you want to do, edit this script to"
    291 
    -          echo >&2 "remove the line 'exit 1' and run it again."
    292 
    -          echo >&2 "See tor-browser-build#41168 for more details."
    293 
    -          exit 1
    294 
    -        fi
    295 
    -        git checkout "d938943"
    296 
    -
    297 
    -        static-update-component aus1.torproject.org
    298 
    -        ```
    299 
    -    - [ ] Enable update responses:
    271 
    +    - [ ] Enable update responses, passing the commit hash as argument (replace $commit):
    300 272 
           ```bash
    301 
    -      sudo -u tb-release ./deploy_update_responses-release.sh
    273 
    +      sudo -u tb-release ./deploy_update_responses-release.sh $commit
    302 274 
           ```
    303 275
    304 276 
     </details>

  • tools/signing/upload-update_responses-to-staticiforme
    ... ... @@ -55,12 +55,20 @@ cat << EOF > "$deploy_script"
    55 55 
     #!/bin/bash
    56 56 
     set -e
    57 57
    58 
    -echo "Deploying version $tbb_version"
    59 
    -echo "update_responses_commit: $update_responses_commit"
    58 
    +if test "\$#" -gt 1; then
    59 
    +  echo >&2 "Wrong number of arguments"
    60 
    +  exit 2
    61 
    +fi
    62 
    +
    63 
    +commit=$update_responses_commit
    64 
    +test "\$#" -eq 1 && commit="\$1"
    65 
    +
    66 
    +test "\$#" -eq 0 && echo "Deploying version $tbb_version"
    67 
    +echo "update_responses_commit: \$commit"
    60 68
    61 69 
     cd "$update_dir"
    62 70 
     git fetch
    63 
    -changed_files="\$(git diff --name-only HEAD $update_responses_commit)"
    71 
    +changed_files="\$(git diff --name-only HEAD \$commit)"
    64 72 
     if echo "\$changed_files" | grep -qv "$tbb_version_type"
    65 73 
     then
    66 74 
       echo >&2 "Error: checking out new update_response_commit will changes"
    ... ... @@ -72,7 +80,7 @@ then
    72 80 
       echo >&2 "See tor-browser-build#41168 for more details."
    73 81 
       exit 1
    74 82 
     fi
    75 
    -git checkout "$update_responses_commit"
    83 
    +git checkout "\$commit"
    76 84
    77 85 
     static-update-component aus1.torproject.org
    78 86 
     EOF

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help 

    _______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits