Branch: refs/heads/master Author: Enrico Tröger enrico.troeger@uvena.de Committer: GitHub noreply@github.com Date: Thu, 12 Oct 2023 21:41:56 UTC Commit: c5373642a609f603c5fd6fd18c96001ac36d4696 https://github.com/geany/geany-plugins/commit/c5373642a609f603c5fd6fd18c9600...

Log Message: ----------- Merge pull request #1278 from eht16/fix_ci_version_parser

Fix ci version parser

Modified Paths: -------------- build/ci_mingw64_geany_plugins.sh

Modified: build/ci_mingw64_geany_plugins.sh 15 lines changed, 12 insertions(+), 3 deletions(-) =================================================================== @@ -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}" } @@ -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

-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).