Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import Tor packages for noble too #252

Merged
merged 1 commit into from
Nov 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/update-tor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ jobs:
REPREPRO_BASE_DIR=repo reprepro --export=never update

# Move the new packages over, intentionally leaving the old ones around
mv repo/pool/main/t/tor/*.deb core/focal/
mv repo/pool/main/t/tor/*focal*.deb core/focal/
mv repo/pool/main/t/tor/*noble*.deb core/noble/
git add core/focal/*.deb
git add core/noble/*.deb
# If there are changes, diff-index will fail, so we commit and push
git diff-index --quiet HEAD || (git commit -m "Automatically updating Tor packages" \
&& git push origin main && ./scripts/new-tor-issue)
3 changes: 2 additions & 1 deletion repo/conf/distributions
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Architectures: amd64
ValidFor: 6m
Description: SecureDrop server packages (focal)
SignWith: 83127F68BABB04F3FE9A69AA545E94503FAB65AB
Update: tor
Update: tor-focal

Origin: SecureDrop
Codename: noble
Expand All @@ -14,6 +14,7 @@ Architectures: amd64
ValidFor: 6m
Description: SecureDrop server packages (noble)
SignWith: 83127F68BABB04F3FE9A69AA545E94503FAB65AB
Update: tor-noble

Origin: SecureDrop
Codename: buster
Expand Down
10 changes: 9 additions & 1 deletion repo/conf/updates
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Name: tor
Name: tor-focal
Method: https://deb.torproject.org/torproject.org
Components: main
Suite: focal
Expand All @@ -7,3 +7,11 @@ Architectures: amd64
VerifyRelease: 74A941BA219EC810
ListShellHook: grep-dctrl -e -S '^tor(-geoip)?$' || [ $? -eq 1 ]

Name: tor-noble
Method: https://deb.torproject.org/torproject.org
Components: main
Suite: noble
GetInRelease: no
Architectures: amd64
VerifyRelease: 74A941BA219EC810
ListShellHook: grep-dctrl -e -S '^tor(-geoip)?$' || [ $? -eq 1 ]