From 61fed35107c475fc8ded2fe685cf7980c5fef60c Mon Sep 17 00:00:00 2001
From: Paul Bartell <pbartell@amazon.com>
Date: Fri, 16 Dec 2022 11:58:04 -0800
Subject: CI: add win32-mingw demo to GithubActions workflow

---
 .github/workflows/freertos_demos.yml | 26 +++++++++++++++++++++++++-
 FreeRTOS/Demo/WIN32-MingW/Makefile   |  4 ++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/freertos_demos.yml b/.github/workflows/freertos_demos.yml
index 1de5f6ac7..f09dac156 100644
--- a/.github/workflows/freertos_demos.yml
+++ b/.github/workflows/freertos_demos.yml
@@ -3,7 +3,7 @@ on: pull_request
 
 jobs:
   WIN32-MSVC:
-    name: Microsoft Visual C Compiler (WIN32)
+    name: WIN32 MSVC
     runs-on: windows-latest
     steps:
       - name: Checkout Repository
@@ -25,6 +25,30 @@ jobs:
         working-directory: FreeRTOS/Demo/WIN32-MSVC-Static-Allocation-Only
         run: msbuild WIN32.sln -t:rebuild
 
+  WIN32-MingW:
+    name: WIN32 MingW
+    runs-on: windows-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+
+      - name: Fetch Kernel Submodule
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 FreeRTOS/Source
+
+      - name: Fetch Kernel Submodule
+        shell: bash
+        run: |
+          git submodule update --checkout --init --depth 1 FreeRTOS/Source
+
+      - name: Build WIN32-MingW Demo
+        working-directory: FreeRTOS/Demo/WIN32-MingW
+        run: |
+          gcc --version
+          make --version
+          make
+
   POSIX-GCC:
     name: Native GCC
     runs-on: ubuntu-latest
diff --git a/FreeRTOS/Demo/WIN32-MingW/Makefile b/FreeRTOS/Demo/WIN32-MingW/Makefile
index 45cbe0db5..05465cc8d 100644
--- a/FreeRTOS/Demo/WIN32-MingW/Makefile
+++ b/FreeRTOS/Demo/WIN32-MingW/Makefile
@@ -12,8 +12,8 @@ else
 endif
 
 # Linker - Note this expects you are using MinGW version of GCC
-LD :=  gcc
-LDFLAGS := -Xlinker -Map=$(BUILD_DIR)/rtosdemo.map 
+LD :=  ${CC}
+LDFLAGS := -Xlinker -Map=$(BUILD_DIR)/rtosdemo.map
 
 # Executable Targets
 EXE := $(BUILD_DIR)/RTOSDemo.exe
-- 
cgit v1.2.1