Skip to content

Commit

Permalink
Merge pull request #1278 from eht16/fix_ci_version_parser
Browse files Browse the repository at this point in the history
Fix ci version parser
  • Loading branch information
eht16 authored Oct 12, 2023
2 parents 2a8361f + 8a677b4 commit c537364
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions build/ci_mingw64_geany_plugins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
Expand All @@ -144,8 +148,13 @@ patch_version_information() {
MINOR="${BASH_REMATCH[2]}"
PATCH="${BASH_REMATCH[4]}"
if [ -z "${PATCH}" ] || [ "${PATCH}" = "0" ]; then
MINOR="$((MINOR-1))"
PATCH="90"
if [ "${MINOR}" = "0" ]; then
MAJOR="$((MAJOR-1))"
MINOR="99"
else
MINOR="$((MINOR-1))"
fi
PATCH="99"
else
PATCH="$((PATCH-1))"
fi
Expand Down

0 comments on commit c537364

Please sign in to comment.