From 5b1effcca347cce93910c3198cd886ebcb269d73 Mon Sep 17 00:00:00 2001
From: Alexandre Bouijoux <alexandre@bouijoux.fr>
Date: Wed, 14 Feb 2024 20:20:59 +0100
Subject: [PATCH] Merged jobs as steps

---
 .github/workflows/build-docker-image.yaml | 19 ++++++-------------
 .github/workflows/build-incus-image.yaml  | 19 ++++++-------------
 .github/workflows/build-lxc-image.yaml    | 19 ++++++-------------
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/build-docker-image.yaml b/.github/workflows/build-docker-image.yaml
index 14d0113..7e7d89c 100644
--- a/.github/workflows/build-docker-image.yaml
+++ b/.github/workflows/build-docker-image.yaml
@@ -2,27 +2,20 @@ name: Build Docker image
 on:
   workflow_dispatch:
 
-concurrency:
-  group: default
-
 env:
   os: mageia
 
 jobs:
-  clone-repo:
-    name: Clone repo
-    uses: ./.github/workflows/checkout-self-hosted.yaml
-
-  build-rootfs:
-    name: Build rootfs
-    needs: clone-repo
-    uses: ./.github/workflows/build-rootfs.yaml
-
   build_for_target:
     name: Build for target
     runs-on: self-hosted
-    needs: build-rootfs
     steps:
+      - name: Clone repo
+        uses: ./.github/workflows/checkout-self-hosted.yaml
+
+      - name: Build rootfs
+        uses: ./.github/workflows/build-rootfs.yaml
+
       - name: Cache build
         id: build
         uses: actions/cache@v4
diff --git a/.github/workflows/build-incus-image.yaml b/.github/workflows/build-incus-image.yaml
index baba30f..0ae99c0 100644
--- a/.github/workflows/build-incus-image.yaml
+++ b/.github/workflows/build-incus-image.yaml
@@ -2,27 +2,20 @@ name: Build Incus image
 on:
   workflow_dispatch:
 
-concurrency:
-  group: default
-
 env:
   os: mageia
 
 jobs:
-  clone-repo:
-    name: Clone repo
-    uses: ./.github/workflows/checkout-self-hosted.yaml
-
-  build-rootfs:
-    name: Build rootfs
-    needs: clone-repo
-    uses: ./.github/workflows/build-rootfs.yaml
-
   build-for-target:
     name: Build for target
     runs-on: self-hosted
-    needs: build-rootfs
     steps:
+      - name: Clone repo
+        uses: ./.github/workflows/checkout-self-hosted.yaml
+
+      - name: Build rootfs
+        uses: ./.github/workflows/build-rootfs.yaml
+
       - name: Cache build
         id: build
         uses: actions/cache@v4
diff --git a/.github/workflows/build-lxc-image.yaml b/.github/workflows/build-lxc-image.yaml
index af529bf..dfda499 100644
--- a/.github/workflows/build-lxc-image.yaml
+++ b/.github/workflows/build-lxc-image.yaml
@@ -2,27 +2,20 @@ name: Build LXC image
 on:
   workflow_dispatch:
 
-concurrency:
-  group: default
-
 env:
   os: mageia
 
 jobs:
-  clone-repo:
-    name: Clone repo
-    uses: ./.github/workflows/checkout-self-hosted.yaml
-
-  build-rootfs:
-    name: Build rootfs
-    needs: clone-repo
-    uses: ./.github/workflows/build-rootfs.yaml
-
   build-for-target:
     name: Build for target
     runs-on: self-hosted
-    needs: build-rootfs
     steps:
+      - name: Clone repo
+        uses: ./.github/workflows/checkout-self-hosted.yaml
+
+      - name: Build rootfs
+        uses: ./.github/workflows/build-rootfs.yaml
+
       - name: Cache build
         id: build
         uses: actions/cache@v4