[tor-commits] [Git][tpo/applications/tor-browser-build][maint-13.5] 2 commits: Bug 41168: Check that we are not changing other channel when deploying update_responses

[morgan (@morgan)]

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


Commits:
32537994 by Nicolas Vigier at 2024-08-22T19:09:19+00:00
Bug 41168: Check that we are not changing other channel when deploying update_responses

- - - - -
fb9e1493 by Nicolas Vigier at 2024-08-22T19:09:23+00:00
Bug 41168: Fix check in update_responses deploy script

The check for modified files from other channels was inverted.

- - - - -


1 changed file:

- tools/signing/upload-update_responses-to-staticiforme


Changes:

=====================================
tools/signing/upload-update_responses-to-staticiforme
=====================================
@@ -63,6 +63,18 @@ echo "update_responses_commit: $update_responses_commit"
 
 cd "$update_dir"
 git fetch
+changed_files="\$(git diff --name-only HEAD $update_responses_commit)"
+if echo "\$changed_files" | grep -qv "$tbb_version_type"
+then
+  echo >&2 "Error: checking out new update_response_commit will changes"
+  echo >&2 "some files outside of the $tbb_version_type directory:"
+  echo "\$changed_files" | grep -v "$tbb_version_type" >&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 "$update_responses_commit"
 
 static-update-component aus1.torproject.org



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

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


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240822/7cebf1a4/attachment-0001.htm>