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.

Sign up for GitHub

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

Jump to bottom

Development -> Main (Remove Buster) #83

Merged
merged 3 commits into from
Aug 22, 2024
Merged

Development -> Main (Remove Buster) #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f96ad03
Remove instances of buster build from pipeline
Saundr21 Aug 21, 2024
9557e13
Remove instances of buster build from pipeline (#82)
Saundr21 Aug 21, 2024
95920b9
ATOR-406 - Fix DA fingerprint (#84)
yumirkov Aug 22, 2024
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
9 changes: 0 additions & 9 deletions .github/workflows/build-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,6 @@ jobs:
suite: bullseye
arch: arm64
runner: arm64
# Debian Buster
- os: debian
suite: buster
arch: amd64
runner: ubuntu-latest
- os: debian
suite: buster
arch: arm64
runner: arm64
# Ubuntu Noble
- os: ubuntu
suite: noble
Expand Down
10 changes: 0 additions & 10 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,16 +217,6 @@ debian-disable-relay:
script:
- ./scripts/ci/ci-driver.sh

#####
# GPL licensed mode, enables pow module
debian-gpl:
image: debian:buster
<<: *debian-template
variables:
GPL: "yes"
script:
- ./scripts/ci/ci-driver.sh

#####
# NSS check on debian
debian-nss:
Expand Down
2 changes: 0 additions & 2 deletions debian/misc/backport
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ squeeze d6.squeeze 1
wheezy d7.wheezy 1
jessie d8.jessie 1
stretch d9.stretch 1
buster d10.buster 1
bullseye d11.bullseye 1
bookworm d12.bookworm 1
trixie d13.trixie 1
Expand All @@ -47,7 +46,6 @@ squeeze-bpo bpo6 1 squeeze-backports
wheezy-bpo bpo7 1 wheezy-backports
jessie-bpo bpo8 1 jessie-backports
stretch-bpo bpo9 1 stretch-backports
buster-bpo bpo10 1 buster-backports
bullseye-bpo bpo11 1 bullseye-backports
bookworm-bpo bpo12 1 bookworm-backports
trixie-bpo bpo13 1 trixie-backports
Expand Down
4 changes: 1 addition & 3 deletions debian/misc/build-anon-sources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,7 @@ backport_all() {

# buster
#################################################
bp1 $pkg $dir $sid_debian_version buster
(cd $dir; remove_runit)
bp2 $pkg $dir $origtar
# null

# bullseye
#################################################
Expand Down
58 changes: 9 additions & 49 deletions operations/anon-debian-repo.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,53 +170,53 @@ fetchers:
repo: ator-protocol
assets_regexp: ^anon.+-dev-.+\.deb
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_stage_github_releases
owner: ATOR-Development
repo: ator-protocol
assets_regexp: ^anon.+-stage-.+\.deb
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_beta_github_releases
owner: ATOR-Development
repo: ator-protocol
assets_regexp: ^anon.+-beta-.+\.deb
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_live_github_releases
owner: ATOR-Development
repo: ator-protocol
assets_regexp: ^anon.+-live-.+\.deb
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
nginx_access_log:
- name: anon_dev_debian_repo
access_log_path: "/alloc/data/access.log"
access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-dev.+\.deb HTTP\/1\.1" 200'
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_stage_debian_repo
access_log_path: "/alloc/data/access.log"
access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-stage.+\.deb HTTP\/1\.1" 200'
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_beta_debian_repo
access_log_path: "/alloc/data/access.log"
access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-beta.+\.deb HTTP\/1\.1" 200'
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
- name: anon_live_debian_repo
access_log_path: "/alloc/data/access.log"
access_log_regexp: '"GET /pool/.+anon_[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+-live.+\.deb HTTP\/1\.1" 200'
labels:
os: 'anon.+(bookworm|bullseye|buster|noble|lunar|jammy|focal).+\.deb'
os: 'anon.+(bookworm|bullseye|noble|lunar|jammy|focal).+\.deb'
arch: '(amd64|arm64)\.deb'
EOH
destination = "local/exporter.yml"
Expand Down Expand Up @@ -307,14 +307,6 @@ Components: main
Description: Anon Debian Bullseye Live
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-live-buster
Architectures: amd64 arm64 source
Components: main
Description: Anon Debian Buster Live
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-live-noble
Expand Down Expand Up @@ -367,14 +359,6 @@ Components: main
Description: Anon Debian Bullseye Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-beta-buster
Architectures: amd64 arm64 source
Components: main
Description: Anon Debian Buster Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-beta-noble
Expand Down Expand Up @@ -427,14 +411,6 @@ Components: main
Description: Anon Debian Bullseye Stage
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-stage-buster
Architectures: amd64 arm64 source
Components: main
Description: Anon Debian Buster Stage
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-stage-noble
Expand Down Expand Up @@ -487,14 +463,6 @@ Components: main
Description: Anon Debian Bullseye Dev
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-dev-buster
Architectures: amd64 arm64 source
Components: main
Description: Anon Debian Buster Dev
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-dev-noble
Expand Down Expand Up @@ -547,14 +515,6 @@ Components: main
Description: Anon Debian Bullseye Unstable Dev
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-unstable-dev-buster
Architectures: amd64 arm64 source
Components: main
Description: Anon Debian Buster Unstable Dev
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-unstable-dev-noble
Expand Down Expand Up @@ -600,7 +560,7 @@ SignWith: YES
Name: incoming
IncomingDir: /data/debian/incoming
TempDir: /tmp
Allow: anon-live-bookworm anon-live-bullseye anon-live-buster anon-live-noble anon-live-lunar anon-live-jammy anon-live-focal anon-beta-bookworm anon-beta-bullseye anon-beta-buster anon-beta-noble anon-beta-lunar anon-beta-jammy anon-beta-focal anon-stage-bookworm anon-stage-bullseye anon-stage-buster anon-stage-noble anon-stage-lunar anon-stage-jammy anon-stage-focal anon-dev-bookworm anon-dev-bullseye anon-dev-buster anon-dev-noble anon-dev-lunar anon-dev-jammy anon-dev-focal anon-unstable-dev-bookworm anon-unstable-dev-bullseye anon-unstable-dev-buster anon-unstable-dev-noble anon-unstable-dev-lunar anon-unstable-dev-jammy anon-unstable-dev-focal
Allow: anon-live-bookworm anon-live-bullseye anon-live-noble anon-live-lunar anon-live-jammy anon-live-focal anon-beta-bookworm anon-beta-bullseye anon-beta-noble anon-beta-lunar anon-beta-jammy anon-beta-focal anon-stage-bookworm anon-stage-bullseye anon-stage-noble anon-stage-lunar anon-stage-jammy anon-stage-focal anon-dev-bookworm anon-dev-bullseye anon-dev-noble anon-dev-lunar anon-dev-jammy anon-dev-focal anon-unstable-dev-bookworm anon-unstable-dev-bullseye anon-unstable-dev-noble anon-unstable-dev-lunar anon-unstable-dev-jammy anon-unstable-dev-focal
Cleanup: on_deny on_error unused_files
EOH
destination = "local/incoming"
Expand Down
2 changes: 1 addition & 1 deletion src/app/config/auth_dirs_dev.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"AnyoneDmzDev orport=9001 "
"v3ident=B4962270303E4566EF7326A0B3E57FE32EC0859E "
"88.99.219.105:9030 148206F447039632ACC1BFE35C57E6106CF6E5E3",
"88.99.219.105:9030 CDC5115240E378E40AB01F156217AEF5C8135729",
"AnyoneFalDev orport=9001 "
"v3ident=7C8C4C3BB0A20AFFC82BB483950A6520B8B1930B "
"176.9.29.53:9030 4B509397F5D55A8DEE015AAE062F787182A90849",
Expand Down
Loading