From 0e52a261cc5c4a832603ea033248e73d8bcc195b Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Sun, 14 Nov 2021 21:20:47 -0300
Subject: [PATCH 1/2] Fix Jenkins CMake flags on MSYSTEM switching

---
 .ci/build.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/build.sh b/.ci/build.sh
index 24738fbfb..5d71fcc91 100644
--- a/.ci/build.sh
+++ b/.ci/build.sh
@@ -145,7 +145,7 @@ build() {
 				echo [-] Switching to MSYSTEM [$msys]
 				cd "$cwd"
 				CHERE_INVOKING=yes MSYSTEM="$msys" JOB_BASE_NAME="$JOB_BASE_NAME" BUILD_TYPE="$BUILD_TYPE" BUILD_NUMBER="$BUILD_NUMBER" GIT_COMMIT="$GIT_COMMIT" \
-					bash -lc 'exec "'$0'" -b "'$arch'" '$cmake_flags && job_status=0 # make sure the main script exits cleanly on any success
+					bash -lc 'exec "'$0'" -b "'$arch'" '"$cmake_flags" && job_status=0 # make sure the main script exits cleanly on any success
 				return $?
 			fi
 		else
@@ -354,7 +354,7 @@ EOF
 		:
 	else
 		# Create binary tarball.
-		make_tar ../$job_name-Linux-$arch$build_fn.tar
+		VERBOSE=1 make_tar ../$job_name-Linux-$arch$build_fn.tar
 		local status=$?
 	fi
 	cd ..

From a45d8ac3ae371b85f0cd21a7eccdb773bd8705f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= <dhrdlicka@users.noreply.github.com>
Date: Mon, 15 Nov 2021 01:40:10 +0100
Subject: [PATCH 2/2] Reduce the number of makefile GH jobs

---
 .github/workflows/c-cpp.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 619d2c871..362becce6 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -1,4 +1,4 @@
-name: C/C++ CI
+name: MinGW64 Makefile
 
 on:
 
@@ -16,7 +16,7 @@ on:
 
 jobs:
   build:
-    name: ${{ matrix.environment.msystem }} makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }}, CLANG=${{ matrix.clang }})
+    name: ${{ matrix.environment.msystem }} Makefile build (DEV_BUILD=${{ matrix.dev-build }}, NEW_DYNAREC=${{ matrix.new-dynarec }})
 
     runs-on: windows-latest
 
@@ -25,11 +25,10 @@ jobs:
         shell: msys2 {0}
 
     strategy:
-      fail-fast: false
+      fail-fast: true
       matrix:
         dev-build: ['y', 'n']
         new-dynarec: ['y', 'n']
-        clang: ['y', 'n']
         environment:
           - msystem: MINGW32
             prefix: mingw-w64-i686
@@ -37,9 +36,6 @@ jobs:
           - msystem: MINGW64
             prefix: mingw-w64-x86_64
             x64: y
-          - msystem: UCRT64
-            prefix: mingw-w64-ucrt-x86_64
-            x64: y
 
     steps:
     - uses: msys2/setup-msys2@v2
@@ -49,7 +45,6 @@ jobs:
         install: >-
           make
           ${{ matrix.environment.prefix }}-gcc
-          ${{ matrix.environment.prefix }}-clang
           ${{ matrix.environment.prefix }}-pkg-config
           ${{ matrix.environment.prefix }}-openal
           ${{ matrix.environment.prefix }}-freetype
@@ -60,5 +55,5 @@ jobs:
           ${{ matrix.environment.prefix }}-winpthreads
     - uses: actions/checkout@v2
     - name: make
-      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} CLANG=${{ matrix.clang }} VNC=n
+      run: make -fwin/makefile.mingw -j DEV_BUILD=${{ matrix.dev-build }} NEW_DYNAREC=${{ matrix.new-dynarec }} X64=${{ matrix.environment.x64 }} VNC=n
       working-directory: ./src