From fb65436e06f406f918daa385f89326c58780aded Mon Sep 17 00:00:00 2001 From: Cosmin Truta Date: Mon, 12 Feb 2024 12:22:43 +0200 Subject: [PATCH] ci: Fix the check of `PNG_LIBPNG_VER_BUILD` in ci_verify_version.sh `PNG_LIBPNG_VER_BUILD` should be zero for public releases and non-zero for development versions. The ci_verify_version.sh script should check this requirement as such. --- ci/ci_verify_version.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/ci/ci_verify_version.sh b/ci/ci_verify_version.sh index 8199d7935..58408ba96 100755 --- a/ci/ci_verify_version.sh +++ b/ci/ci_verify_version.sh @@ -71,16 +71,22 @@ function ci_verify_version { else ci_err "mismatched: \$PNG_LIBPNG_VER_DLLNUM != $my_expect" fi - if [[ "$PNG_LIBPNG_VER_BUILD" == 1 ]] + if [[ "$PNG_LIBPNG_VER_BUILD" == [01] ]] then - ci_info "matched: \$PNG_LIBPNG_VER_BUILD == 1" + ci_info "matched: \$PNG_LIBPNG_VER_BUILD == [01]" else - ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD != 1" + ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD != [01]" fi ci_info "## VERIFYING: png.h build definitions ##" my_expect="${PNG_LIBPNG_VER_MAJOR}.${PNG_LIBPNG_VER_MINOR}.${PNG_LIBPNG_VER_RELEASE}" if [[ "$PNG_LIBPNG_VER_STRING" == "$my_expect" ]] then + if [[ $PNG_LIBPNG_VER_BUILD -eq 0 ]] + then + ci_info "matched: \$PNG_LIBPNG_VER_BUILD -eq 0" + else + ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD -ne 0" + fi if [[ $PNG_LIBPNG_BUILD_BASE_TYPE -eq $PNG_LIBPNG_BUILD_STABLE ]] then ci_info "matched: \$PNG_LIBPNG_BUILD_BASE_TYPE -eq \$PNG_LIBPNG_BUILD_BETA" @@ -89,6 +95,12 @@ function ci_verify_version { fi elif [[ "$PNG_LIBPNG_VER_STRING" == "$my_expect".git ]] then + if [[ $PNG_LIBPNG_VER_BUILD -ne 0 ]] + then + ci_info "matched: \$PNG_LIBPNG_VER_BUILD -ne 0" + else + ci_err "mismatched: \$PNG_LIBPNG_VER_BUILD -eq 0" + fi if [[ $PNG_LIBPNG_BUILD_BASE_TYPE -eq $PNG_LIBPNG_BUILD_BETA ]] then ci_info "matched: \$PNG_LIBPNG_BUILD_BASE_TYPE -eq \$PNG_LIBPNG_BUILD_BETA"