diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
deleted file mode 100644
index d838ed22a..000000000
--- a/.github/workflows/build-macos.yml
+++ /dev/null
@@ -1,71 +0,0 @@
----
-on:
-  workflow_dispatch:
-  push:
-    paths-ignore:
-      - 'android/**'
-      - 'build/**'
-      - 'doc/**'
-      - 'python/**'
-      - 'subprojects/**'
-      - 'systemd/**'
-      - 'win32/**'
-    branches:
-      - master
-      - actions
-  pull_request:
-    paths-ignore:
-      - 'android/**'
-      - 'build/**'
-      - 'doc/**'
-      - 'python/**'
-      - 'subprojects/**'
-      - 'systemd/**'
-      - 'win32/**'
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: macos-latest
-    steps:
-      - id: checkout
-        uses: actions/checkout@v2
-
-      - id: cache-ccache
-        uses: hendrikmuhs/ccache-action@v1
-        with:
-          key: ${{ matrix.os }}-${{ matrix.type }}
-
-      - uses: actions/setup-python@v1
-
-      - name: Install dependencies
-        run: |
-          brew install \
-            meson ninja \
-            fmt \
-            boost \
-            googletest \
-            icu4c \
-            ffmpeg \
-            libnfs \
-            yajl \
-            libupnp \
-            libid3tag \
-            chromaprint \
-            libsamplerate \
-            libsoxr \
-            flac \
-            opus \
-            libvorbis \
-            faad2 \
-            wavpack \
-            libmpdclient
-
-      - name: Meson Build
-        uses: BSFishy/meson-build@v1.0.3
-        with:
-          action: test
-          directory: output
-          setup-options: -Ddocumentation=disabled -Dtest=true
-          meson-version: 0.56.0
diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build.yml
similarity index 71%
rename from .github/workflows/build-linux.yml
rename to .github/workflows/build.yml
index 320612559..fc456b939 100644
--- a/.github/workflows/build-linux.yml
+++ b/.github/workflows/build.yml
@@ -24,12 +24,13 @@ on:
       - 'win32/**'
     branches:
       - master
-env:
-  CC: 'ccache gcc-10'
-  CXX: 'ccache g++-10'
+
 jobs:
-  build:
+  build-linux:
     runs-on: ubuntu-latest
+    env:
+      CC: 'ccache gcc-10'
+      CXX: 'ccache g++-10'
     steps:
       - id: checkout
         uses: actions/checkout@v2
@@ -85,3 +86,47 @@ jobs:
           directory: output/mini
           setup-options: -Dbuildtype=minsize -Dauto_features=disabled -Dtest=true -Ddaemon=false -Dinotify=false -Depoll=false -Deventfd=false -Dsignalfd=false -Dtcp=false -Ddsd=false -Ddatabase=false -Dneighbor=false -Dcue=false -Dfifo=false -Dhttpd=false -Dpipe=false -Drecorder=false -Dsnapcast=false
           meson-version: 0.56.0
+
+  build-macos:
+    runs-on: macos-latest
+    steps:
+      - id: checkout
+        uses: actions/checkout@v2
+
+      - id: cache-ccache
+        uses: hendrikmuhs/ccache-action@v1
+        with:
+          key: ${{ matrix.os }}-${{ matrix.type }}
+
+      - uses: actions/setup-python@v1
+
+      - name: Install dependencies
+        run: |
+          brew install \
+            meson ninja \
+            fmt \
+            boost \
+            googletest \
+            icu4c \
+            ffmpeg \
+            libnfs \
+            yajl \
+            libupnp \
+            libid3tag \
+            chromaprint \
+            libsamplerate \
+            libsoxr \
+            flac \
+            opus \
+            libvorbis \
+            faad2 \
+            wavpack \
+            libmpdclient
+
+      - name: Meson Build
+        uses: BSFishy/meson-build@v1.0.3
+        with:
+          action: test
+          directory: output
+          setup-options: -Ddocumentation=disabled -Dtest=true
+          meson-version: 0.56.0