CI: Log compiler and library versions in build output

geany · Oct 12, 2023 · 27fc3f2 · 27fc3f2
1 parent 7d9edf7
commit 27fc3f2
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/build/ci_mingw64_geany_plugins.sh b/build/ci_mingw64_geany_plugins.sh
@@ -123,7 +123,11 @@ log_environment() {
 	echo "Geany installer              : ${GEANY_INSTALLER_EXECUTABLE}"
 	echo "PATH                         : ${PATH}"
 	echo "HOST                         : ${HOST}"
-	echo "CC                           : ${CC}"
+	echo "GCC                          : $(${HOST}-gcc -dumpfullversion) ($(${HOST}-gcc -dumpversion))"
+	echo "G++                          : $(${HOST}-g++ -dumpfullversion) ($(${HOST}-g++ -dumpversion))"
+	echo "Libstdc++                    : $(dpkg-query --showformat='${Version}' --show libstdc++6:i386)"
+	echo "GLib                         : $(pkg-config --modversion glib-2.0)"
+	echo "GTK                          : $(pkg-config --modversion gtk+-3.0)"
 	echo "CFLAGS                       : ${CFLAGS}"
 	echo "Configure                    : ${CONFIGURE_OPTIONS}"
 }
@@ -143,17 +147,16 @@ patch_version_information() {
 		MAJOR="${BASH_REMATCH[1]}"
 		MINOR="${BASH_REMATCH[2]}"
 		PATCH="${BASH_REMATCH[4]}"
-		if [[ "${MINOR}" = "0" && (-z "${PATCH}" || "${PATCH}" = "0") ]]; then
-			MAJOR="$((MAJOR-1))"
-			MINOR="99"
-			PATCH="99"
-		else
-			if [[ -z "${PATCH}" || "${PATCH}" = "0" ]]; then
-				MINOR="$((MINOR-1))"
-				PATCH="99"
+		if [ -z "${PATCH}" ] || [ "${PATCH}" = "0" ]; then
+			if [ "${MINOR}" = "0" ]; then
+				MAJOR="$((MAJOR-1))"
+				MINOR="99"
 			else
-				PATCH="$((PATCH-1))"
+				MINOR="$((MINOR-1))"
 			fi
+			PATCH="99"
+		else
+			PATCH="$((PATCH-1))"
 		fi
 	else
 		echo "Could not extract or parse version tag" >&2