From 36d3313805ef30967c9aa56aceb6a6e05f9bcd71 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 9 May 2024 12:05:20 +0100
Subject: [PATCH] Clean up Linux/gcc and Windows/VS2022 workflow files

Signed-off-by: Pete Batard <pete@akeo.ie>
---
 .github/workflows/gcc.yml                     | 39 ---------------
 .github/workflows/linux-gcc.yml               | 48 +++++++++++++++++++
 .../{vs2022.yml => windows-vs2022.yml}        |  8 +---
 3 files changed, 49 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/gcc.yml
 create mode 100644 .github/workflows/linux-gcc.yml
 rename .github/workflows/{vs2022.yml => windows-vs2022.yml} (89%)

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
deleted file mode 100644
index 23ebcff..0000000
--- a/.github/workflows/gcc.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-name: Linux, gcc
-
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        include:
-          - { arch: ia32, gcc: multilib, cross_compile: }
-          - { arch: x86_64, gcc: multilib, cross_compile: }
-          - { arch: aa64, gcc: aarch64-linux-gnu, cross_compile: aarch64-linux-gnu- }
-          - { arch: arm, gcc: arm-linux-gnueabihf, cross_compile: arm-linux-gnueabihf- }
-          - { arch: riscv64, gcc: riscv64-linux-gnu, cross_compile: riscv64-linux-gnu- }
-          - { arch: mips64el, gcc: mips64el-linux-gnuabi64, cross_compile: mips64el-linux-gnuabi64- }
-#          - { arch: loongarch64, gcc: loongarch64-linux-gnu, cross_compile: loongarch64-linux-gnu- }
-
-    steps:
-    - name: Install toolchain
-      run: |
-        sudo apt-get update
-        sudo apt-get install gcc-${{ matrix.gcc }}
-
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        fetch-depth: 0
-        submodules: recursive
-
-    - name: Build
-      run: make ARCH=${{ matrix.arch }} CROSS_COMPILE=${{ matrix.cross_compile }}
diff --git a/.github/workflows/linux-gcc.yml b/.github/workflows/linux-gcc.yml
new file mode 100644
index 0000000..e6b5403
--- /dev/null
+++ b/.github/workflows/linux-gcc.yml
@@ -0,0 +1,48 @@
+name: Linux, gcc
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        arch: [ia32, x64, aa64, arm, riscv64, mips64]
+        include:
+          - arch: ia32
+            gcc: multilib
+            cross_compile:
+          - arch: x64
+            gcc: multilib
+            cross_compile:
+          - arch: aa64
+            gcc: aarch64-linux-gnu
+            cross_compile: aarch64-linux-gnu-
+          - arch: arm
+            gcc: arm-linux-gnueabihf
+            cross_compile: arm-linux-gnueabihf-
+          - arch: riscv64
+            gcc: riscv64-linux-gnu
+            cross_compile: riscv64-linux-gnu-
+          - arch: mips64
+            gcc: mips64el-linux-gnuabi64
+            cross_compile: mips64el-linux-gnuabi64-
+#          - arch: loongarch64
+#            gcc: loongarch64-linux-gnu
+#            cross_compile: loongarch64-linux-gnu-
+
+    steps:
+    - name: Install toolchain
+      run: |
+        sudo apt-get update
+        sudo apt-get install gcc-${{ matrix.gcc }}
+
+    - name: Checkout repository
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        submodules: recursive
+
+    - name: Build
+      run: make ARCH=${{ matrix.arch }} CROSS_COMPILE=${{ matrix.cross_compile }}
diff --git a/.github/workflows/vs2022.yml b/.github/workflows/windows-vs2022.yml
similarity index 89%
rename from .github/workflows/vs2022.yml
rename to .github/workflows/windows-vs2022.yml
index e32474a..f860203 100644
--- a/.github/workflows/vs2022.yml
+++ b/.github/workflows/windows-vs2022.yml
@@ -1,12 +1,6 @@
 name: Windows, VS2022
 
-on:
-  push:
-    branches:
-    - master
-  pull_request:
-    branches:
-    - master
+on: [push, pull_request]
 
 env:
   SOLUTION_FILE_PATH: ./gnu-efi.sln