From fa16b49e55a3a68b3dba837d62a71427ea260aec Mon Sep 17 00:00:00 2001
From: Dan Webb <dan.webb@damacus.io>
Date: Wed, 4 Dec 2024 10:37:49 +0000
Subject: [PATCH] Stop being fancy

Signed-off-by: Dan Webb <dan.webb@damacus.io>
---
 .github/workflows/ci.yml | 73 +++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b0335ee..67d67692 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,72 +17,67 @@ jobs:
       statuses: write
       issues: write
 
-  integration-epel:
+  integration: &integration
     needs: lint-unit
     runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+      - name: Install Chef
+        uses: actionshub/chef-install@3.0.0
+      - name: Dokken
+        uses: actionshub/test-kitchen@3.0.0
+        env:
+          CHEF_LICENSE: accept-no-persist
+          KITCHEN_LOCAL_YAML: kitchen.dokken.yml
+        with:
+          suite: ${{ matrix.suite }}
+          os: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
         os:
           - "almalinux-8"
           - "almalinux-9"
+          - "amazonlinux-2023"
           - "centos-stream-8"
           - "centos-stream-9"
+          - "debian-11"
+          - "debian-12"
           - "rockylinux-8"
           - "rockylinux-9"
-        suite:
-          - "epel"
-        steps: &steps
-          - name: Check out code
-            uses: actions/checkout@v4
-          - name: Install Chef
-            uses: actionshub/chef-install@3.0.0
-          - name: Dokken
-            uses: actionshub/test-kitchen@3.0.0
-            env:
-              CHEF_LICENSE: accept-no-persist
-              KITCHEN_LOCAL_YAML: kitchen.dokken.yml
-            with:
-              suite: ${{ matrix.suite }}
-              os: ${{ matrix.os }}
-
-  integration-nginx-full:
-    needs: lint-unit
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        os:
           - "ubuntu-2204"
           - "ubuntu-2404"
         suite:
-          - "distro-nginx-full"
-      fail-fast: false
-    steps:
-      <<: *steps
+          - "distro"
+          - "repo"
+          - "repo-overrides"
 
-  integration:
-    needs: lint-unit
-    runs-on: ubuntu-latest
+  integration-epel:
+    <<: *integration
     strategy:
+      fail-fast: false
       matrix:
         os:
           - "almalinux-8"
           - "almalinux-9"
-          - "amazonlinux-2023"
           - "centos-stream-8"
           - "centos-stream-9"
-          - "debian-11"
-          - "debian-12"
           - "rockylinux-8"
           - "rockylinux-9"
+        suite:
+          - "epel"
+
+  integration-nginx-full:
+    <<: *integration
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
           - "ubuntu-2204"
           - "ubuntu-2404"
         suite:
-          - "distro"
-          - "repo"
-          - "repo-overrides"
-      fail-fast: false
-    steps:
-      <<: *steps
+          - "distro-nginx-full"
 
   final:
     runs-on: ubuntu-latest