From 210c1bbe21967d9330c0eb196d68bdd43bc87496 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= <jerome@riseup.net>
Date: Thu, 27 Feb 2025 22:13:44 -0500
Subject: [PATCH] restore arm64 builds, cleanup obsolete tag vars
---
debian/.debian-ci.yml | 83 ++++++-------------------------------------
1 file changed, 11 insertions(+), 72 deletions(-)
diff --git a/debian/.debian-ci.yml b/debian/.debian-ci.yml
index 4a25a6fd5b..4c19c8a9db 100644
--- a/debian/.debian-ci.yml
+++ b/debian/.debian-ci.yml
@@ -63,7 +63,7 @@ default:
timeout: 6h
variables:
GIT_STRATEGY: none
- tags: [ $RUNNER_TAG, $HOSTING_PROVIDER_TAG, $PHYSICAL_TAG ]
+ tags: [ $HOSTING_PROVIDER_TAG, $DOCKER_ARCH ]
before_script:
- rm -rf build-env binary-packages
- *apt-init
@@ -152,90 +152,29 @@ default:
- OS: debian
SUITE: [ 'sid', 'bullseye', 'bookworm', 'trixie' ]
DOCKER_ARCH: amd64
- RUNNER_TAG: amd64
HOSTING_PROVIDER_TAG: tpa
- PHYSICAL_TAG: tpa # we don't care about physical
- #IMAGE_EXTENSION: '-slim'
- #- OS: debian
- # SUITE: [ 'sid', 'buster', 'bullseye', 'bookworm', 'trixie' ]
- # DOCKER_ARCH: i386
- # RUNNER_TAG: amd64
- # HOSTING_PROVIDER_TAG: tpa
- # PHYSICAL_TAG: physical
- # IMAGE_EXTENSION: '-slim'
- # SPECIAL: [ '' ]
- #- OS: debian
- # DOCKER_ARCH: 'arm64v8'
- # SUITE: [ 'sid', 'buster', 'bullseye', 'bookworm', 'trixie' ]
- # RUNNER_TAG: aarch64
- # HOSTING_PROVIDER_TAG: osuosl
- # PHYSICAL_TAG: osuosl # we don't care about physical
- # IMAGE_EXTENSION: '-slim'
- # SPECIAL: [ '' ]
+ - OS: debian
+ SUITE: [ 'sid', 'bullseye', 'bookworm', 'trixie' ]
+ DOCKER_ARCH: arm64
+ HOSTING_PROVIDER_TAG: osuosl
- OS: debian
SUITE: 'bullseye'
DOCKER_ARCH: amd64
- RUNNER_TAG: amd64
HOSTING_PROVIDER_TAG: tpa
- PHYSICAL_TAG: tpa # we don't care about physical
- #IMAGE_EXTENSION: '-slim'
- SPECIAL: [ 'bpo11' ]
- #- OS: debian
- # SUITE: 'bullseye'
- # DOCKER_ARCH: i386
- # RUNNER_TAG: amd64
- # HOSTING_PROVIDER_TAG: tpa
- # PHYSICAL_TAG: physical
- # IMAGE_EXTENSION: '-slim'
- # SPECIAL: [ 'bpo11' ]
- OS: debian
SUITE: 'bookworm'
DOCKER_ARCH: amd64
- RUNNER_TAG: amd64
HOSTING_PROVIDER_TAG: tpa
- PHYSICAL_TAG: tpa # we don't care about physical
- #IMAGE_EXTENSION: '-slim'
SPECIAL: [ 'bpo12' ]
- #- OS: debian
- # SUITE: 'bookworm'
- # DOCKER_ARCH: i386
- # RUNNER_TAG: amd64
- # HOSTING_PROVIDER_TAG: tpa
- # PHYSICAL_TAG: physical
- # IMAGE_EXTENSION: '-slim'
- # SPECIAL: [ 'bpo12' ]
-
- #- OS: ubuntu
- # SUITE: [ 'xenial', 'bionic', 'noble', 'oracular' ]
- # DOCKER_ARCH: amd64
- # RUNNER_TAG: amd64
- # HOSTING_PROVIDER_TAG: tpa
- # PHYSICAL_TAG: tpa # we don't care about physical
- # IMAGE_EXTENSION: [ '' ]
- #- OS: ubuntu
- # SUITE: [ 'xenial', 'bionic' ]
- # DOCKER_ARCH: i386
- # RUNNER_TAG: amd64
- # HOSTING_PROVIDER_TAG: tpa
- # PHYSICAL_TAG: physical
- # IMAGE_EXTENSION: [ '' ]
- # SPECIAL: [ '' ]
+
- OS: ubuntu
SUITE: [ 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
- DOCKER_ARCH: 'amd64'
- RUNNER_TAG: amd64
+ DOCKER_ARCH: amd64
HOSTING_PROVIDER_TAG: tpa
- PHYSICAL_TAG: tpa # we don't care about physical
- IMAGE_EXTENSION: [ '' ]
- SPECIAL: [ '' ]
- #- OS: ubuntu
- # SUITE: [ 'xenial', 'bionic', 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
- # DOCKER_ARCH: 'arm64v8'
- # RUNNER_TAG: 'aarch64'
- # HOSTING_PROVIDER_TAG: osuosl
- # PHYSICAL_TAG: osuosl # we don't care about physical
- # IMAGE_EXTENSION: [ '' ]
- # SPECIAL: [ '' ]
+ - OS: ubuntu
+ SUITE: [ 'focal', 'jammy', 'lunar', 'mantic', 'noble', 'oracular' ]
+ DOCKER_ARCH: arm64
+ HOSTING_PROVIDER_TAG: osuosl
###########################
--
GitLab