Remove version tweak, if present.

Author: MarkCallow

.github/workflows/check-libktx-only.yml

@@ -113,16 +113,11 @@ jobs:
     - name: Prepare version number and architecture for artifact
       id: libktx-version
       shell: bash
-      # The ktx.version file in the parent of the build directory will include
-      # the "tweak", if the package version has one. The library version though
-      # reflects the API version so does not include the tewak. Extract the
-      # version from the generated version.h file instead.
-      #
       # Arch set up is to match arch to names used in releases and platforms.
       # N.B. If `>> ${{ github.env }} is used here variables are not seen in
       # following step on Windows runners. Linux and macOS have no problem.
       run: |
-        echo KTX_VERSION=$(grep -A 1 -m 1 "Code version" lib/src/version.h | tail -n 1) >> $GITHUB_ENV
+        echo KTX_VERSION=$(cat ${{ env.BUILD_DIR_TL }}/ktx.version) >> $GITHUB_ENV
         arch=$(echo ${{ runner.arch }} | tr '[:upper:]' '[:lower:]')
         if [ "$arch" = "x64" ]; then arch=x86_64; fi
         echo ARCH=$arch >> $GITHUB_ENV

scripts/check_lib_build_output.sh

@@ -17,12 +17,17 @@ if [[ $# -ne 2 ]]; then
 fi
 
 cd $1
-version=$2
-if [[ $version =~ ([0-9]+).[0-9]+.[0-9]+ ]]; then
+
+fullversion=$2
+# If the incoming version is a full (package) version that includes
+# a tweak, remove it. Library version reflect the API version so do
+# not include a tweak.
+if [[ $fullversion =~ (([0-9]+).[0-9]+.[0-9]+)(-.*$)? ]]; then
   major=${BASH_REMATCH[1]}
-  echo "major is $major"
+  version=${BASH_REMATCH[2]}
+  #echo "major is $major, version is $version"
 else
-  echo "version number must have the form major.minor.patch".
+  echo "version number must have the form major.minor.patch[-tweak]".
   usage
   exit 1
 fi