From 8f5f645564a4ceb2c32e990a4ef48ddbf39a2176 Mon Sep 17 00:00:00 2001
From: Zachary Hall <catmeow72@proton.me>
Date: Fri, 17 Nov 2023 14:18:00 -0800
Subject: [PATCH] Move test workflow into Linux workflow and delete the
 original file.

---
 .github/workflows/linux.yml | 26 ++++++++++++++++++++++++--
 .github/workflows/test.yml  | 31 -------------------------------
 2 files changed, 24 insertions(+), 33 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 065016e..c5157ef 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -1,4 +1,4 @@
-name: Build for Linux
+name: Linux workflow
 
 on:
   push:
@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-
+    name: Build for Linux
     runs-on: ubuntu-latest
 
     steps:
@@ -24,3 +24,25 @@ jobs:
       with:
         name: linux
         path: builddir/b16converter
+  test:
+    name: Test on Linux
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Install dependencies
+      run: sudo apt update -y && sudo apt install meson build-essential libmagick++-dev -y
+    - name: Download executable
+      uses: actions/download-artifact@v2.1.1
+      with:
+        name: linux
+        path: b16convert
+    - name: Set up build directory
+      run: meson setup builddir
+    - name: Run test script
+      run: ./test.sh -p b16convert
+    - name: Upload test artifacts
+      uses: actions/upload-artifact@v3.1.3
+      with:
+        name: test-files
+        path: testout
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 594faac..0000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Test on Linux
-
-on:
-  push:
-    branches: [ "main" ]
-  pull_request:
-    branches: [ "main" ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Install dependencies
-      run: sudo apt update -y && sudo apt install meson build-essential libmagick++-dev -y
-    - name: Download executable
-      uses: actions/download-artifact@v2.1.1
-      with:
-        name: linux
-        path: b16convert
-    - name: Set up build directory
-      run: meson setup builddir
-    - name: Run test script
-      run: ./test.sh -p b16convert
-    - name: Upload test artifacts
-      uses: actions/upload-artifact@v3.1.3
-      with:
-        name: test-files
-        path: testout