From bf6d1ba3d12772a487e6b7cb8af1d90fbe00fdb1 Mon Sep 17 00:00:00 2001
From: Rokas Kupstys <rokups@zoho.com>
Date: Tue, 26 Nov 2019 12:17:58 +0200
Subject: [PATCH] CI: Add 32/64 bit build variations to builds with extra
 warnings.

---
 .github/workflows/build.yml    | 23 ++++++++++++++++++++---
 examples/example_null/Makefile |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b0b09fa..265c400d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -154,10 +154,27 @@ jobs:
     - name: Install Dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y libglfw3-dev libsdl2-dev
+        sudo apt-get install -y libglfw3-dev libsdl2-dev gcc-multilib g++-multilib
 
-    - name: Build example_null (extra warnings)
-      run: make -C examples/example_null EXTRA_WARNINGS=1
+    - name: Build example_null (extra warnings, gcc 32-bit)
+      run: |
+        make -C examples/example_null clean
+        CXXFLAGS="$CXXFLAGS -m32" make -C examples/example_null EXTRA_WARNINGS=1
+
+    - name: Build example_null (extra warnings, gcc 64-bit)
+      run: |
+        make -C examples/example_null clean
+        CXXFLAGS="$CXXFLAGS -m64" make -C examples/example_null EXTRA_WARNINGS=1
+
+    - name: Build example_null (extra warnings, clang 32-bit)
+      run: |
+        make -C examples/example_null clean
+        CXXFLAGS="$CXXFLAGS -m32" CXX=clang++ make -C examples/example_null EXTRA_WARNINGS=1
+
+    - name: Build example_null (extra warnings, clang 64-bit)
+      run: |
+        make -C examples/example_null clean
+        CXXFLAGS="$CXXFLAGS -m64" CXX=clang++ make -C examples/example_null EXTRA_WARNINGS=1
 
     - name: Build example_null (unity build)
       run: make -C examples/example_null UNITY_BUILD=1
diff --git a/examples/example_null/Makefile b/examples/example_null/Makefile
index 16802cba..56c5f3da 100644
--- a/examples/example_null/Makefile
+++ b/examples/example_null/Makefile
@@ -15,7 +15,7 @@ endif
 OBJS = $(addsuffix .o, $(basename $(notdir $(SOURCES))))
 UNAME_S := $(shell uname -s)
 
-CXXFLAGS = -I../ -I../../
+CXXFLAGS += -I../ -I../../
 CXXFLAGS += -g -Wall -Wformat
 LIBS =