From 1c339f28abbc0528da3048d0b9eadeaba442f374 Mon Sep 17 00:00:00 2001
From: Andy Doan <andy@foundries.io>
Date: Thu, 26 Sep 2024 13:10:28 -0500
Subject: [PATCH] ci: Combine actions to build Yocto

The workflows are the same. We can use one file to remove duplication.
I've changed the names of a couple attributes to make things look a
little more sane in the GitHub Actions UI.

Signed-off-by: Andy Doan <andy@foundries.io>
---
 .../{merge-main.yml => build-yocto.yml}       |  7 +++--
 .github/workflows/pull-request.yml            | 30 -------------------
 2 files changed, 4 insertions(+), 33 deletions(-)
 rename .github/workflows/{merge-main.yml => build-yocto.yml} (90%)
 delete mode 100644 .github/workflows/pull-request.yml

diff --git a/.github/workflows/merge-main.yml b/.github/workflows/build-yocto.yml
similarity index 90%
rename from .github/workflows/merge-main.yml
rename to .github/workflows/build-yocto.yml
index 6d46d8c7..541e8d20 100644
--- a/.github/workflows/merge-main.yml
+++ b/.github/workflows/build-yocto.yml
@@ -1,12 +1,13 @@
-name: Push Build
+name: Build Yocto
 
 on:
+  pull_request:
   push:
     branches:
       - main
 
 jobs:
-  kas:
+  compile:
     strategy:
       fail-fast: true
       matrix:
@@ -21,7 +22,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: kas build
+      - name: Kas build
         run: |
           export DL_DIR=/srv/gh-runners/quic-yocto/downloads
           export SSTATE_DIR=/srv/gh-runners/quic-yocto/sstate-cache
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
deleted file mode 100644
index 8c017048..00000000
--- a/.github/workflows/pull-request.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: PR Build
-
-on:
-  pull_request:
-
-jobs:
-  kas:
-    strategy:
-      fail-fast: true
-      matrix:
-        machine:
-          - qcm6490-idp
-          - qcs6490-rb3gen2-core-kit
-          - sa8775p-ride-sx
-    runs-on: [self-hosted, x86]
-    name: ${{ matrix.machine }}/poky/systemd
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: kas build
-        run: |
-          export DL_DIR=/srv/gh-runners/quic-yocto/downloads
-          export SSTATE_DIR=/srv/gh-runners/quic-yocto/sstate-cache
-          mkdir -p $DL_DIR
-          mkdir -p $SSTATE_DIR
-          mkdir build
-          cd build
-          kas build ../ci/${{ matrix.machine }}.yml