Skip LDGLite build check (CHECK_04) when running Snap builds

trevorsandy · trevorsandy · commit 5e29322cb1bb · 2025-01-18T02:53:24.000+01:00
diff --git a/builds/check/build_checks.sh b/builds/check/build_checks.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Trevor SANDY
-# Last Update November 28, 2024
+# Last Update January 17, 2025
 # Copyright (C) 2018 - 2025 by Trevor SANDY
 # LPub3D Unix build checks - for remote CI (Travis, OBS)
 # NOTE: Source with variables as appropriate:
@@ -179,7 +179,12 @@ if [[ -n "${LP3D_CHECK_LDD}" && ${VALID_APPIMAGE} -eq 0 ]]; then
     find ${LPUB3D_LDD_EXE} -executable -type f -exec ldd {} \;
 fi
 
-LP3D_BUILD_CHECK_LIST=( CHECK_01 CHECK_02 CHECK_03 CHECK_04 CHECK_05 )
+# Skip LDGLite build check (CHECK_04) when running Snap builds
+if [[ "$LP3D_BUILD_OS" = "snap" ]]; then
+    LP3D_BUILD_CHECK_LIST=( CHECK_01 CHECK_02 CHECK_03 CHECK_05 )
+else
+    LP3D_BUILD_CHECK_LIST=( CHECK_01 CHECK_02 CHECK_03 CHECK_04 CHECK_05 )
+fi
 # Skip long running checks when running in QEMU
 if [ "${LP3D_QEMU}" != "true" ]; then
     LP3D_BUILD_CHECK_LIST+=( CHECK_06 CHECK_07 )
diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: December 06, 2024
 #  Copyright (C) 2017 - 2025 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.9.4070
+pkgver=2.4.9.4071
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"
diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: September 16, 2024
 #  Copyright (C) 2017 - 2025 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.9.4070
+pkgver=2.4.9.4071
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"
diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.9.4070) debian; urgency=medium
+lpub3d (2.4.9.4071) debian; urgency=medium
 
-  * LPub3D version 2.4.9.22.4070_20250118 for Linux
+  * LPub3D version 2.4.9.23.4071_20250118 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 18 Jan 2025 02:50:11 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 18 Jan 2025 02:53:16 +0100
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.9.4070
+Version: 2.4.9.4071
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7
diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.9.4070
+Version: 2.4.9.4071
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -816,10 +816,10 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4070
+* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4071
 - LPub3D 2.3.8 enhancements and fixes - see RELEASE_NOTES for details
 
-* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4070
+* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4071
 - LPub3D 2.3.7 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.9.4070) debian; urgency=medium
+lpub3d (2.4.9.4071) debian; urgency=medium
 
-  * LPub3D version 2.4.9.22.4070_20250118 for Linux
+  * LPub3D version 2.4.9.23.4071_20250118 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 18 Jan 2025 02:50:07 +0100
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Sat, 18 Jan 2025 02:53:11 +0100
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.9.4070
+Version: 2.4.9.4071
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7
diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.9.4070
+Version: 2.4.9.4071
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -314,10 +314,10 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4070
+* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4071
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
-* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4070
+* Sat Jan 18 2025 - trevor.dot.sandy.at.gmail.dot.com 2.4.9.4071
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670
diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 9 22 4070 8dc4846ed
+2 4 9 23 4071 bf24c8e09
diff --git a/gitversion.pri b/gitversion.pri
@@ -44,7 +44,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 22
+        GIT_REVISION = 23
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -72,7 +72,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 4070
+            GIT_COMMIT = 4071
             message("~~~ ERROR LPUB3D! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -120,7 +120,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR LPUB3D! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.22.4070.8dc4846ed
+            GIT_VERSION = $${VERSION}.23.4071.bf24c8e09
             message("~~~ $${LPUB3D} GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }
diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.9.22.4070 (18 01 2025 02:50:11)
+LPub3D 2.4.9.23.4071 (18 01 2025 02:53:16)
 
 Features, enhancements, fixes and changes
 ------------
diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -80,7 +80,7 @@ <h2>LPub3D Official release.</h2>
 </div>
 <table class="tg">
   <ol id="ticketOL"><!-- Update update-config-files.sh/bat on line change -->
-  <li><code><h4>LPub3D 2.4.9.22.4070 (18 01 2025 02:50:11)</h4></code></li>
+  <li><code><h4>LPub3D 2.4.9.23.4071 (18 01 2025 02:53:16)</h4></code></li>
   <li><code><a href="https://github.com/trevorsandy/lpub3d/issues/805">2.4.9 Enhancement - Inconsistency with parts list shape inputs #805</a></code></li>
   <li><code><a href="https://github.com/trevorsandy/lpub3d/issues/806">2.4.9 HowTo - Set theme check script in extras folder for Linux and macOS distros #806</a></code></li>
   <li><code><a href="https://github.com/trevorsandy/lpub3d/issues/804">2.4.9 Regression - Library Update failed #804</a></code></li>
diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
@@ -14,8 +14,8 @@
 ;;
 ;; Author......: Trevor SANDY
 ;; Name........: LPub3D_Npp_UDL.xml
-;; Version.....: 2.4.9.22.4070
-;; Last Update.: Sat, 18 Jan 2025 02:50:11 +0100
+;; Version.....: 2.4.9.23.4071
+;; Last Update.: Sat, 18 Jan 2025 02:53:16 +0100
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2025 by Trevor SANDY
diff --git a/mainApp/lpub3d.appdata.xml b/mainApp/lpub3d.appdata.xml
@@ -78,9 +78,9 @@
             <binary>lpub3d24</binary>
         ​</provides>
         <releases>
-            <release version="2.4.9.4070" date="2025-01-18">
+            <release version="2.4.9.4071" date="2025-01-18">
                 <description>
-                    <p>LPub3D 18.01.2025 v2.4.9 r22 Continuous Build.
+                    <p>LPub3D 18.01.2025 v2.4.9 r23 Continuous Build.
                         - Enhancement - Inconsistency with parts list shape inputs #805
                         - HowTo - Set theme check script in extras folder for Linux and macOS distros #806
                         - Regression - Library Update failed #804

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-2 4 9 22 4070 8dc4846ed`
	`1`	`+2 4 9 23 4071 bf24c8e09`