diff --git a/.github/workflows/Tests.yml b/.github/workflows/Tests.yml
index 9da93463..6613b2bb 100644
--- a/.github/workflows/Tests.yml
+++ b/.github/workflows/Tests.yml
@@ -1,28 +1,53 @@
-name: Tests
-
-on: [push, pull_request]
+name: Build and tests
+
+on:
+  push:
+    branches:
+      - '*'
+    paths-ignore:
+      - '**/README.md'
+  pull_request:
+    branches:
+      - '*'
+  workflow_dispatch:
 
 jobs:
-  Test:
-
-    runs-on: ubuntu-20.04
+  build:
+    name: ${{ matrix.platform.os }} ${{ matrix.config.name }} ${{ matrix.type.name }}
+    runs-on: ${{ matrix.platform.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        platform:
+        # - { name: Windows VS2019, os: windows-2019 }
+        # - { name: Windows VS2022, os: windows-2022 }
+        - { name: Linux GCC,      os: ubuntu-20.04, flags: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_STANDARD=17 }
+        - { name: Linux Clang,    os: ubuntu-20.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_STANDARD=17 }
+        - { name: Linux GCC,      os: ubuntu-18.04, flags: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_CXX_STANDARD=14 }
+        - { name: Linux Clang,    os: ubuntu-18.04, flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_CXX_STANDARD=14 }
+        # - { name: MacOS XCode,    os: macos-latest }
+        config:
+        - { name: Shared, flags: -DBUILD_SHARED_LIBS=TRUE }
+        - { name: Static, flags: -DBUILD_SHARED_LIBS=FALSE }
+        type:
+        - { name: Release, flags: -DCMAKE_BUILD_TYPE=Release }
+        - { name: Debug, flags: -DCMAKE_BUILD_TYPE=Debug }
 
     steps:
     - uses: actions/checkout@v2
       with:
         submodules: recursive
-    
-    - name: Update Packages
-      run: sudo apt-get update
 
-    - name: Install Dependencies
+    - name: Install Linux Dependencies
+      if: runner.os == 'Linux'
       run: sudo apt-get install xorg-dev libglu1-mesa-dev -y
 
     - name: Configure
-      run: cmake -B build .
+      run: cmake -B build -S . -DBUILD_TESTING=ON -DCMAKE_CXX_FLAGS="-Wall -Wextra -Wpedantic" ${{ matrix.platform.flags }} ${{ matrix.type.flags }} ${{ matrix.config.flags }}
 
     - name: Build
       run: cmake --build build
 
     - name: Test
-      run: ./build/tests/raylib_cpp_test
+      run: ctest --verbose --test-dir build