From d2a0f2057e17c0b90740e8800482bbf37f13aacf Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Thu, 5 May 2022 14:27:47 -0400
Subject: [PATCH] refactor

---
 .github/workflows/test.yml | 54 ++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4eac40f9..d989284c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,21 +12,42 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-            go-version: 1.18
+          go-version: 1.18
       - name: Build
         run: |
-         sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
          env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build main.go
          cd netclient
          env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build main.go
          env CGO_ENABLED=0 GOOS=freebsd GOARCH=amd64 go build main.go
          env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build main.go
          env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build main.go
-         env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=gui main.go 
-         #env CGO_ENABLED=1 GOOS=freebsd GOARCH=amd64 go build -tags=gui main.go 
-         env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go 
-         #env CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -tags=gui main.go 
-  test-linux:
+  linux-gui:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.18
+      - name: Build
+        run: |
+         sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
+         env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags=gui main.go
+  mac-gui:
+    runs-on: macos-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Go
+        uses: actions/setup-go@v2
+        with:
+          go-version: 1.18
+      - name: Build mac
+        run: |
+          xcode-select --install
+          env CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 go build -tags=gui main.go
+  tests:
     env:
       DATABASE: sqlite
     runs-on: ubuntu-latest
@@ -44,22 +65,3 @@ jobs:
         env:
           DATABASE: sqlite
           CLIENT_MODE: "off"
-  test-darwin:
-    env:
-      DATABASE: sqlite
-    runs-on: macos-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.18
-      - name: run tests
-        run: |
-            xcode-select install
-            go test -p 1 ./... -v
-        env:
-          DATABASE: sqlite
-          CLIENT_MODE: "off"
-