Development -> Main

anyone-protocol · Aug 15, 2024 · 197b1dd · 197b1dd
2 parents 7084334 + 7930895
commit 197b1dd
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 10 deletions.
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -3,7 +3,8 @@ name: Build Anon Packages
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
+      - '*beta*'
     branches:
       - main
       - development
@@ -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:
 
@@ -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

diff --git a/.github/workflows/live-build-and-deploy.yml b/.github/workflows/live-build-and-deploy.yml
@@ -60,6 +60,7 @@ jobs:
           event-name: ${{ github.event_name }}
 
   deploy:
+    if: ${{ !contains(github.ref, 'beta') }}
     needs: multiarch-push
     runs-on: ubuntu-latest
     steps:

diff --git a/debian/.debian-ci/build_source/build-script b/debian/.debian-ci/build_source/build-script
@@ -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
 

diff --git a/operations/anon-debian-repo.hcl b/operations/anon-debian-repo.hcl
@@ -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
@@ -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'
@@ -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
@@ -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"

diff --git a/src/test/test_bwmgt.c b/src/test/test_bwmgt.c
@@ -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