From 110b6b20fd173f644299a5ef79e0bafc606a60d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
Date: Tue, 23 Apr 2024 14:59:31 +0200
Subject: [PATCH] CI: combine the qa and build stage into a single workflow
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This does not have any immediate benefits but allows us to add a publish
stage in the next step that depends on all the qa steps to complete
successfully and use the artifacts generated by the build stage.

Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
---
 .github/workflows/build.yaml                   | 18 ------------------
 .../{qa.yaml => check-and-build.yaml}          | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 .github/workflows/build.yaml
 rename .github/workflows/{qa.yaml => check-and-build.yaml} (60%)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
deleted file mode 100644
index 1e8ce34..0000000
--- a/.github/workflows/build.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-  build:
-    name: Source Distribution and Wheel
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          # include tags and full history for setuptools_scm
-          fetch-depth: 0
-      - run: make build
-      - uses: actions/upload-artifact@v4
-        with:
-          name: dist
-          path: dist
diff --git a/.github/workflows/qa.yaml b/.github/workflows/check-and-build.yaml
similarity index 60%
rename from .github/workflows/qa.yaml
rename to .github/workflows/check-and-build.yaml
index b6ababf..20e7a60 100644
--- a/.github/workflows/qa.yaml
+++ b/.github/workflows/check-and-build.yaml
@@ -1,4 +1,4 @@
-name: Quality Assurance
+name: Check and Build
 
 on: [push, pull_request]
 
@@ -26,3 +26,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: make qa-ruff
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          # include tags and full history for setuptools_scm
+          fetch-depth: 0
+      - run: make build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist
+          path: dist