From bec9976de472d5f2ccbf99066ec949f92a906b26 Mon Sep 17 00:00:00 2001 From: Calvin Katt Date: Tue, 14 May 2024 17:59:10 +0200 Subject: [PATCH 1/2] Updated CI packaging stage to use a different runner tag per job to allow choosing of different runners for different architectures (e.g. RPi5 for arm64) Signed-off-by: Calvin Katt --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a67c7b2dc..46a779d06 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,7 +171,7 @@ pkg:docker: --tag ${DOCKER_IMAGE}:${DOCKER_TAG}-${ARCH} . - docker push ${DOCKER_IMAGE}:${DOCKER_TAG}-${ARCH} tags: - - docker + - $TAG variables: TARGET: app parallel: @@ -180,6 +180,12 @@ pkg:docker: PLATFORM: linux/amd64 ARCH: x86_64 TRIPLET: x86_64-linux-gnu + TAG: docker + - DISTRO: debian + PLATFORM: linux/arm64/v8 + ARCH: arm64 + TRIPLET: aarch64-linux-gnu + TAG: PI5 # - DISTRO: debian # PLATFORM: linux/arm/v7 # ARCH: armhf From 6545bb4923d7661fba88b3fe26b20eebee96a2a4 Mon Sep 17 00:00:00 2001 From: Calvin Katt Date: Tue, 14 May 2024 18:22:27 +0200 Subject: [PATCH 2/2] Updated deploy:docker CI job to fix broken dependency on changed packaging job Signed-off-by: Calvin Katt --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 46a779d06..40b5b6615 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,7 +217,7 @@ deploy:docker: needs: # - job: "pkg:docker: [debian, linux/arm64/v8, arm64, aarch64-linux-gnu, packaging/docker/Dockerfile.debian-multiarch]" # - job: "pkg:docker: [debian, linux/arm/v7, armhf, arm-linux-gnueabihf, packaging/docker/Dockerfile.debian-multiarch]" - - job: "pkg:docker: [debian, linux/amd64, x86_64, x86_64-linux-gnu]" + - job: "pkg:docker: [debian, linux/amd64, x86_64, x86_64-linux-gnu, docker]" deploy:docker-dev: stage: deploy