Merge pull request #562 from jongough/updates

Updates
jongough · Dec 21, 2024 · 525ebc8 · 525ebc8
2 parents 610df30 + 2db72da
commit 525ebc8
Show file tree

Hide file tree

Showing 3 changed files with 717 additions and 687 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -33,11 +33,11 @@ workflows:
              <<: *std-filters
         - build-android-armhf:
              <<: *std-filters
-        - build-flatpak-arm64-2208:
+        - build-flatpak-aarch64-2208:
             <<: *std-filters
         - build-flatpak-x86-2208:
             <<: *std-filters
-        - build-flatpak-arm64-2408:
+        - build-flatpak-aarch64-2408:
             <<: *std-filters
         - build-flatpak-x86-2408:
             <<: *std-filters
@@ -202,12 +202,13 @@ jobs:
             command: ci\circleci-build-msvc.bat
         - deploy-code:
             deploy_use_orb: false
-    build-flatpak-arm64-2208:
+    build-flatpak-aarch64-2208:
         machine:
             image: ubuntu-2204:current
             resource_class: arm.medium
         environment:
-        - OCPN_TARGET:  flatpak-arm64
+        - OCPN_TARGET:  flatpak
+        - BUILD_ARCH: aarch64
         - FLATPAK_BRANCH: stable
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 22.08
@@ -224,6 +225,7 @@ jobs:
             resource_class: arm.medium
         environment:
         - OCPN_TARGET:  flatpak
+        - BUILD_ARCH: x86_64
         - FLATPAK_BRANCH: stable
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 22.08
@@ -235,12 +237,13 @@ jobs:
             command: bash ci/circleci-build-flatpak.sh
             no_output_timeout: 30m
         - deploy-code
-    build-flatpak-arm64-2408:
+    build-flatpak-aarch64-2408:
         machine:
             image: ubuntu-2204:current
             resource_class: arm.medium
         environment:
-        - OCPN_TARGET:  flatpak-arm64
+        - OCPN_TARGET:  flatpak
+        - BUILD_ARCH: aarch64
         - FLATPAK_BRANCH: stable
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 24.08
@@ -257,6 +260,7 @@ jobs:
             resource_class: arm.medium
         environment:
         - OCPN_TARGET:  flatpak
+        - BUILD_ARCH: x86_64
         - FLATPAK_BRANCH: stable
         - CLOUDSMITH_PKG_EXT: gz
         - SDK_VER: 24.08
@@ -308,8 +312,7 @@ jobs:
         - deploy-code
     build-debian-x86_64-12-bookworm:
         machine:
-            image: ubuntu-2204:current
-            resource_class: arm.medium
+            image: ubuntu-2404:current
         environment:
         - OCPN_TARGET: bookworm
         - BUILD_GTK3: true
@@ -331,7 +334,7 @@ jobs:
         environment:
         - OCPN_TARGET=bullseye-armhf
         - DOCKER_IMAGE=jongough/debian-armhf:bullseye
-        - BUILD_FLbuild-debian-arm64-12-bookwormAGS=-j3
+        - BUILD_FLAGS=-j3
         - BUILD_ENV=debian
         - BUILD_GTK3: true
         - DEPLOY_USE_ORB: true

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -23,7 +23,7 @@
 # - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx,
 # - xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 # -----------------------------------------------------------------------------
-# Frontend2 Author: Jon Gough Testplugn(TP) v1.0.310.0 15/10/2024 DD/MM/YYYY
+# Frontend2 Author: Jon Gough Testplugn(TP) v1.0.318.0 21/12/2024 DD/MM/YYYY
 # format buildCI:yes provideODAPI:yes validateJSON:yes
 # ---------------------------------------------------------------------------
 # -- When changing this file do NOT change the order of the sections. -- Make
@@ -60,9 +60,9 @@ set(PACKAGE "ocpn_draw")
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "8")
-set(VERSION_PATCH "56")
+set(VERSION_PATCH "57")
 set(VERSION_TWEAK "0")
-set(VERSION_DATE "23/10/2024") # DD/MM/YYYY format
+set(VERSION_DATE "21/12/2024") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")
 set(OCPN_API_VERSION_MAJOR "1")
 set(OCPN_API_VERSION_MINOR "17")