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

Development #81

Merged
merged 2 commits into from
Aug 15, 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
10 changes: 6 additions & 4 deletions .github/workflows/build-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ name: Build Anon Packages
on:
push:
tags:
- '*'
- 'v*'
- '*beta*'
branches:
- main
- development
Expand All @@ -15,11 +16,12 @@ on:
env:
DEBIAN_FRONTEND: noninteractive

# tags: live
# tags (v*): live
# tags (*beta*): beta
# main: stage
# development: dev
# everything else (pull request, etc.): unstable-dev
PKG_ENV: ${{ github.ref_type == 'tag' && 'live' || github.ref == 'refs/heads/main' && 'stage' || github.ref == 'refs/heads/development' && 'dev' || 'unstable-dev' }}
PKG_ENV: ${{ github.ref_type == 'tag' && (contains(github.ref, 'beta') && 'beta' || 'live') || github.ref == 'refs/heads/main' && 'stage' || github.ref == 'refs/heads/development' && 'dev' || 'unstable-dev' }}

jobs:

Expand Down Expand Up @@ -486,7 +488,7 @@ jobs:
release-github:
runs-on: ubuntu-latest
needs: [build-deb-package, build-macos-binary, sign-windows-64-binary]
if: startsWith(github.ref, 'refs/tags/')
if: ${{ startsWith(github.ref, 'refs/tags/') && !contains(github.ref, 'beta') }}
steps:
- name: Download raw artifacts
uses: actions/download-artifact@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/live-build-and-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ jobs:
event-name: ${{ github.event_name }}

deploy:
if: ${{ !contains(github.ref, 'beta') }}
needs: multiarch-push
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion debian/.debian-ci/build_source/build-script
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ tardir="${tardir%%/}"
dir_version="${tardir##${pkg}-}"

build_version="${dir_version}"
if [ "$pkg_env" = "dev" ] || [ "$pkg_env" = "unstable-dev" ]; then
if [ "$pkg_env" = "stage" ] || [ "$pkg_env" = "dev" ] || [ "$pkg_env" = "unstable-dev" ]; then
build_version="${dir_version}-${ts}"
fi

Expand Down
75 changes: 74 additions & 1 deletion operations/anon-debian-repo.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,13 @@ fetchers:
labels:
os: 'anon.+(bookworm|bullseye|buster|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'
arch: '(amd64|arm64)\.deb'
- name: anon_live_github_releases
owner: ATOR-Development
repo: ator-protocol
Expand All @@ -199,6 +206,12 @@ fetchers:
labels:
os: 'anon.+(bookworm|bullseye|buster|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'
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'
Expand Down Expand Up @@ -338,6 +351,66 @@ DDebComponents: main
Description: Anon Ubuntu Focal Live
SignWith: YES

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

Origin: Anon
Label: Anon
Codename: anon-beta-bullseye
Architectures: amd64 arm64 source
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
Architectures: amd64 arm64 source
Components: main
DDebComponents: main
Description: Anon Ubuntu Noble Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-beta-lunar
Architectures: amd64 arm64 source
Components: main
DDebComponents: main
Description: Anon Ubuntu Lunar Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-beta-jammy
Architectures: amd64 arm64 source
Components: main
DDebComponents: main
Description: Anon Ubuntu Jammy Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-beta-focal
Architectures: amd64 arm64 source
Components: main
DDebComponents: main
Description: Anon Ubuntu Focal Beta
SignWith: YES

Origin: Anon
Label: Anon
Codename: anon-stage-bookworm
Expand Down Expand Up @@ -527,7 +600,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-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-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
Cleanup: on_deny on_error unused_files
EOH
destination = "local/incoming"
Expand Down
9 changes: 5 additions & 4 deletions src/test/test_bwmgt.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,11 @@ test_bwmgt_dir_conn_global_write_low(void *arg)

/* Now, lets try with a connection address from ATORDAeucdev. It should
* always pass even though our limit is too low. */
addr_family = tor_addr_parse(&conn->addr, "88.99.219.105");
tt_int_op(addr_family, OP_EQ, AF_INET);
ret = connection_dir_is_global_write_low(conn, INT_MAX);
tt_int_op(ret, OP_EQ, 0);
// TODO(ator): this test is not suitable because we have different IPs on envs
// addr_family = tor_addr_parse(&conn->addr, "88.99.219.105");
// tt_int_op(addr_family, OP_EQ, AF_INET);
// ret = connection_dir_is_global_write_low(conn, INT_MAX);
// tt_int_op(ret, OP_EQ, 0);

/* IPv6 testing of ATORDAeucdev. */
// TODO(ator): uncoment once we have DA with ipv6
Expand Down
Loading