From e32de837589989efe374a7abd8c11d38fd890d66 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 5 Oct 2023 12:23:17 +0200
Subject: [PATCH] CI updates

---
 .github/workflows/weekly-ci-cc-llvm-mingw.yml | 12 +++---
 src/Makefile                                  | 43 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/weekly-ci-cc-llvm-mingw.yml b/.github/workflows/weekly-ci-cc-llvm-mingw.yml
index e98bb005..eae1c1f4 100644
--- a/.github/workflows/weekly-ci-cc-llvm-mingw.yml
+++ b/.github/workflows/weekly-ci-cc-llvm-mingw.yml
@@ -24,12 +24,12 @@ jobs:
           - name: llvm-mingw-20230614-ucrt
             llvm_version: 16.0.6
             url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20230614/llvm-mingw-20230614-ucrt-ubuntu-20.04-x86_64.tar.xz'
-          - name: llvm-mingw-20230919-msvcrt
-            llvm_version: 17.0.1
-            url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20230919/llvm-mingw-20230919-msvcrt-ubuntu-20.04-x86_64.tar.xz'
-          - name: llvm-mingw-20230919-ucrt
-            llvm_version: 17.0.1
-            url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20230919/llvm-mingw-20230919-ucrt-ubuntu-20.04-x86_64.tar.xz'
+          - name: llvm-mingw-20231003-msvcrt
+            llvm_version: 17.0.2
+            url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20231003/llvm-mingw-20231003-msvcrt-ubuntu-20.04-x86_64.tar.xz'
+          - name: llvm-mingw-20231003-ucrt
+            llvm_version: 17.0.2
+            url: 'https://github.com/mstorsjo/llvm-mingw/releases/download/20231003/llvm-mingw-20231003-ucrt-ubuntu-20.04-x86_64.tar.xz'
     name: ${{ format('{0} {1}', matrix.name, matrix.llvm_version) }}
     runs-on: ubuntu-latest
     steps:
diff --git a/src/Makefile b/src/Makefile
index f572d7f3..71876b35 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -23,21 +23,22 @@ endif
 
 build/debug:   $(top_srcdir)/build/debug/upx
 build/release: $(top_srcdir)/build/release/upx
-# shortcuts
-all: build/debug build/release
-debug: build/debug
-release: build/release
-
-$(top_srcdir)/build/debug/upx: PHONY
-	$(MAKE) -C $(top_srcdir) build/debug
-$(top_srcdir)/build/release/upx: PHONY
-	$(MAKE) -C $(top_srcdir) build/release
 
 .NOTPARALLEL: # because the actual builds use "cmake --parallel"
 .PHONY: PHONY
 .SECONDEXPANSION:
 .SUFFIXES:
 
+# shortcuts (all => debug + release)
+debug:   build/debug
+release: build/release
+all build/all: build/debug build/release
+
+$(top_srcdir)/build/debug/upx: PHONY
+	$(MAKE) -C $(top_srcdir) build/debug
+$(top_srcdir)/build/release/upx: PHONY
+	$(MAKE) -C $(top_srcdir) build/release
+
 #
 # "make run-testsuite"
 # see https://github.com/upx/upx-testsuite.git
@@ -73,6 +74,18 @@ run-testsuite-release: PHONY $(top_srcdir)/build/release/upx
 endif
 endif
 
+#
+# "make check-whitespace"
+#
+
+ifneq ($(wildcard /usr/bin/env),) # needs bash, perl, xargs, etc.
+CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace.sh $(top_srcdir)
+ifneq ($(wildcard $(top_srcdir)/.git/.),)
+CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace_git.sh $(top_srcdir)
+endif
+check-whitespace: PHONY; $(CHECK_WHITESPACE)
+endif
+
 #
 # "make clang-format"
 #
@@ -89,16 +102,4 @@ clang-format: PHONY $(CLANG_FORMAT_FILES)
 	@$(top_srcdir)/misc/scripts/upx-clang-format.sh -i $(CLANG_FORMAT_FILES)
 endif
 
-#
-# "make check-whitespace"
-#
-
-ifneq ($(wildcard /usr/bin/env),) # needs bash, perl, xargs, etc.
-CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace.sh $(top_srcdir)
-ifneq ($(wildcard $(top_srcdir)/.git/.),)
-CHECK_WHITESPACE = $(top_srcdir)/misc/scripts/check_whitespace_git.sh $(top_srcdir)
-endif
-check-whitespace: PHONY; $(CHECK_WHITESPACE)
-endif
-
 # vim:set ts=8 sw=8 noet: