From 784a8fd106ad3b68b9a4a06e04fc85b36994c733 Mon Sep 17 00:00:00 2001
From: Romain BOULLARD <romain.boullard@protonmail.com>
Date: Fri, 23 Jan 2026 17:29:11 +0100
Subject: [PATCH] drop DRY

---
 .gitea/workflows/ci.yaml | 52 +++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 16 deletions(-)

diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml
index e4e17b6..56a7e83 100644
--- a/.gitea/workflows/ci.yaml
+++ b/.gitea/workflows/ci.yaml
@@ -8,29 +8,19 @@ on:
 
 env:
   DOCKER_TLS_CERTDIR: "/certs"
+
   BASE_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxbasebuilder:${{ github.ref_name }}
   CPP_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxcppbuilder:${{ github.ref_name }}
   BIGFOOT_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxbigfootbuilder:${{ github.ref_name }}
   BIGFOOT_COVERAGE_BUILDER_TAG: ${{ vars.CI_REGISTRY_IMAGE }}/linuxbigfootcoveragebuilder:${{ github.ref_name }}
 
 jobs:
-  docker-build:
+  build-base-builder:
     runs-on: ubuntu-latest
     timeout-minutes: 360
-    strategy:
-      matrix:
-        builder:
-          - name: base
-            path: ./Linux/BaseBuilder
-            tag: ${{ env.BASE_BUILDER_TAG }}
-            build_args: ""
-          - name: cpp
-            path: ./Linux/CPPBuilder
-            tag: ${{ env.CPP_BUILDER_TAG }}
-            build_args: "--build-arg BASE_BUILDER=${{ env.BASE_BUILDER_TAG }}"
     container:
-      image: docker:29.1.5-dind
-      options: --privileged
+        image: docker:29.1.5-dind
+        options: --privileged
     services:
       docker:
         image: docker:29.1.5-dind
@@ -50,7 +40,37 @@ jobs:
           password: ${{ secrets.CI_TOKEN }}
 
       - name: Build Builder
-        run: docker build -t "${{ matrix.builder.tag }}" ${{ matrix.builder.build_args }} "${{ matrix.builder.path }}"
+        run: docker build -t "$BASE_BUILDER_TAG" ./Linux/BaseBuilder
 
       - name: Push Builder
-        run: docker push "${{ matrix.builder.tag }}"
+        run: docker push "$BASE_BUILDER_TAG"
+
+  build-cpp-builder:
+    runs-on: ubuntu-latest
+    timeout-minutes: 360
+    container:
+        image: docker:29.1.5-dind
+        options: --privileged
+    services:
+      docker:
+        image: docker:29.1.5-dind
+        options: --privileged
+    steps:
+      - name: Install Node.js
+        run: apk add --no-cache nodejs npm
+
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Login to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ${{ vars.CI_REGISTRY }}
+          username: ${{ secrets.CI_USERNAME }}
+          password: ${{ secrets.CI_TOKEN }}
+
+      - name: Build Builder
+        run: docker build -t "$CPP_BUILDER_TAG" ./Linux/CPPBuilder --build-arg BASE_BUILDER="$BASE_BUILDER_TAG"
+
+      - name: Push Builder
+        run: docker push "$CPP_BUILDER_TAG"
\ No newline at end of file