From c4bbe591af6bf0254d61c8539bf26ceae0be9b97 Mon Sep 17 00:00:00 2001
From: Sophist <3001893+Sophist-UK@users.noreply.github.com>
Date: Wed, 21 Feb 2024 12:56:33 +0000
Subject: [PATCH] Simplified workflows

---
 .../{build_push.yaml => build_multiple.yaml}  |  6 ++-
 .github/workflows/build_release.yaml          | 49 -------------------
 2 files changed, 5 insertions(+), 50 deletions(-)
 rename .github/workflows/{build_push.yaml => build_multiple.yaml} (91%)
 delete mode 100644 .github/workflows/build_release.yaml

diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_multiple.yaml
similarity index 91%
rename from .github/workflows/build_push.yaml
rename to .github/workflows/build_multiple.yaml
index 8d25362920cb..e058181e7cd3 100644
--- a/.github/workflows/build_push.yaml
+++ b/.github/workflows/build_multiple.yaml
@@ -1,4 +1,4 @@
-name: Build firmware - Push (Dagoma variants)
+name: Build firmware - All Dagoma variants
 
 on:
   pull_request:
@@ -7,6 +7,10 @@ on:
   push:
     branches:
       - DE200-2.1.x
+  release:
+    types:
+      - published
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow_ref }}-${{ github.ref }}
diff --git a/.github/workflows/build_release.yaml b/.github/workflows/build_release.yaml
deleted file mode 100644
index 71d3056af599..000000000000
--- a/.github/workflows/build_release.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-name: Build firmware - Release (Dagoma variants)
-
-on:
-  release:
-    types:
-      - published
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow_ref }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build_multiple:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        lang:
-          - en
-          - fr
-          - de
-        bicol: [0, 1]
-        filsens: [0, 1]
-        trapez: [0, 1]
-        xl: [0, 1]
-        nolcd: [0, 1]
-        therm: [0, 1]
-        bltouch: [0]
-        pinout: [0]
-        z122: [0]
-        exclude:
-          - nolcd: 1
-            lang: [fr, de]
-    name: Build ${{ matrix.lang }}
-    uses: ./.github/workflows/build_single.yaml
-    with:
-      lang:     ${{ matrix.lang }}
-      bicol:    ${{ matrix.bicol }}
-      filsens:  ${{ matrix.filsens }}
-      trapez:   ${{ matrix.trapez }}
-      xl:       ${{ matrix.xl }}
-      nolcd:    ${{ matrix.nolcd }}
-      therm:    ${{ matrix.therm }}
-      bltouch:  ${{ matrix.bltouch }}
-      pinout:   ${{ matrix.pinout }}
-      z122:     ${{ matrix.z122 }}
-    secrets: inherit