Obj query current

.circleci/config.yml

@@ -23,67 +23,175 @@ flatpak-steps: &flatpak-steps
     - run: ci/git-push.sh /build-flatpak
 
 jobs:
+  build-buster:
+    docker:
+      - image: circleci/buildpack-deps:bullseye-scm
+    environment:
+      - OCPN_TARGET: bullseye
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-buster.sh
+      - run: sh -c "ci/maybe-push-upload.sh"
 
-  build-bionic-armhf:
+  build-buster-armhf:
     machine:
       image: ubuntu-2004:202101-01
     resource_class: arm.medium
     environment:
-      - OCPN_TARGET: ubuntu-armhf
       - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    parameters:
-      cache-key:
-        type: string
-        default: "fp-arm20-v2"
     steps:
       - checkout
-      - run: ci/circleci-build-bionic-armhf.sh
-      - run: cd build-ubuntu; /bin/bash < upload.sh
-      - run: ci/git-push.sh build-ubuntu
+      - run: ci/circleci-build-buster-armhf.sh
+      - run: cd build-debian; /bin/bash < upload.sh
 
-  build-focal-armhf:
+  build-bullseye:
+    docker:
+      - image: circleci/buildpack-deps:bullseye-scm
+    environment:
+      - OCPN_TARGET: bullseye
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    <<: *debian-steps
+
+  build-bullseye-wx32:
+    docker:
+      - image: circleci/buildpack-deps:bullseye-scm
+    environment:
+      - OCPN_TARGET: bullseye
+      - BUILD_WX32: true
+      - TARGET_TUPLE: debian-wx32;11;x86_64
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    <<: *debian-steps
+
+  build-bullseye-armhf:
     machine:
       image: ubuntu-2004:202101-01
     resource_class: arm.medium
     environment:
-      - OCPN_TARGET: ubuntu-gtk3-armhf
+      - TARGET_TUPLE: debian;11;armhf
+      - OCPN_TARGET: bullseye
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-armhf.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+  build-bullseye-wx32-armhf:
+    machine:
+      image: ubuntu-2004:202101-01
+    resource_class: arm.medium
+    environment:
+      - TARGET_TUPLE: debian-wx32;11;armhf
+      - OCPN_TARGET: bullseye
+      - BUILD_WX32: true
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-armhf.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+
+  build-bullseye-arm64:
+    machine:
+      image: ubuntu-2004:2022.04.1
+    resource_class: arm.medium
+    environment:
+      - OCPN_TARGET: bullseye
+      - TARGET_TUPLE: debian;11;arm64
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-docker.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+  build-bullseye-wx32-arm64:
+    machine:
+      image: ubuntu-2004:2022.04.1
+    resource_class: arm.medium
+    environment:
+      - OCPN_TARGET: bullseye
+      - BUILD_WX32: true
+      - TARGET_TUPLE: debian-wx32;11;arm64
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-docker.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+
+  build-bookworm:
+    machine:
+      image: ubuntu-2004:2022.04.1
+    resource_class: medium
+    environment:
+      - OCPN_TARGET: bookworm
+      - TARGET_TUPLE: debian;12;x86_64
       - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    parameters:
-      cache-key:
-        type: string
-        default: "fp-arm20-v2"
     steps:
       - checkout
-      - run: ci/circleci-build-focal-armhf.sh
-      - run: cd build-ubuntu; /bin/bash < upload.sh
-      - run: ci/git-push.sh build-ubuntu
+      - run: ci/circleci-build-debian-docker.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+  build-bookworm-arm64:
+    machine:
+      image: ubuntu-2004:2022.04.1
+    resource_class: arm.medium
+    environment:
+      - OCPN_TARGET: bookworm
+      - TARGET_TUPLE: debian;12;arm64
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-docker.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
+
+  build-bookworm-armhf:
+    machine:
+      image: ubuntu-2004:202101-01
+    resource_class: arm.medium
+    environment:
+      - TARGET_TUPLE: debian;12;armhf
+      - OCPN_TARGET: bookworm
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: ci/circleci-build-debian-armhf.sh
+      - run: cd build-debian; /bin/bash < upload.sh
+      - run: ci/git-push.sh build-debian
 
   build-flatpak-arm64:
     machine:
       image: ubuntu-2004:202101-01
     resource_class: arm.medium
     environment:
       - OCPN_TARGET: flatpak-arm64
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+      - CMAKE_BUILD_PARALLEL_LEVEL: 1
     parameters:
       cache-key:
         type: string
+        # Update the last part, here v2, to invalidate cache
         default: "fp-arm20-v2"
     <<: *flatpak-steps
 
-  build-flatpak-x86-2008:
+  build-flatpak-x86:
     machine:
       image: ubuntu-2004:202010-01
     environment:
       - OCPN_TARGET: flatpak
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+      - CMAKE_BUILD_PARALLEL_LEVEL: 1
     parameters:
       cache-key:
         type: string
+        # Update the last part, here v2, to invalidate cache
         default: "fp-x86-20-v2"
     <<: *flatpak-steps
 
-
   build-macos:
     macos:
       xcode: "12.5.1"
@@ -98,47 +206,6 @@ jobs:
       - run: cd build-osx; /bin/bash < upload.sh
       - run: ci/git-push.sh  build-osx
 
-  build-bionic:
-    docker:
-      - image: cimg/base:stable-18.04
-    environment:
-      - OCPN_TARGET: bionic
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    <<: *debian-steps
-
-  build-bionic-gtk3:
-    docker:
-      - image: cimg/base:stable-18.04
-    environment:
-      - BUILD_GTK3: true
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
-      - OCPN_TARGET: bionic-gtk3
-    <<: *debian-steps
-
-  build-focal:
-    docker:
-      - image: cimg/base:stable-20.04
-    environment:
-      - OCPN_TARGET: focal
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    <<: *debian-steps
-
-  build-jammy:
-    docker:
-      - image: cimg/base:edge-22.04
-    environment:
-      - OCPN_TARGET: jammy
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    <<: *debian-steps
-
-  build-buster:
-    docker:
-      - image: circleci/buildpack-deps:buster-scm
-    environment:
-      - OCPN_TARGET: buster
-      - OCPN_TARGET_TUPLE: debian;10;x86_64
-      - CMAKE_BUILD_PARALLEL_LEVEL: 2
-    <<: *debian-steps
 
   build-android-arm64:
     docker:
@@ -149,8 +216,7 @@ jobs:
     steps:
       - checkout
       - run: ci/circleci-build-android.sh
-      - run: sh -c "cd /build-$OCPN_TARGET; /bin/bash < upload.sh"
-      - run: sh -c "ci/git-push.sh /build-$OCPN_TARGET"
+      - run: ci/maybe-push-upload.sh
 
   build-android-armhf:
     docker:
@@ -161,48 +227,7 @@ jobs:
     steps:
       - checkout
       - run: ci/circleci-build-android.sh
-      - run: sh -c "cd /build-$OCPN_TARGET; /bin/bash < upload.sh"
-      - run: sh -c "ci/git-push.sh /build-$OCPN_TARGET"
-
-  build-arm64-debian-bullseye:
-        machine:
-            image: ubuntu-2004:202104-01
-        environment:
-        - OCPN_TARGET=bullseye-arm64
-        - DOCKER_IMAGE=arm64v8/debian:bullseye-backports
-        - BUILD_FLAGS=-j3
-        - BUILD_ENV=debian
-        - BUILD_GTK3: true
-        steps:
-        - checkout
-        - run: chmod a+x ./ci/*.sh
-        - run:
-            command: ci/circleci-build-debian-armxx.sh
-            no_output_timeout: 30m
-        - run: sh -c "python3 -m pip install --user --upgrade -q setuptools wheel pip"
-        - run: sh -c "python3 -m pip install --user -q cloudsmith-cli cryptography"
-        - run: sh -c "pip install --upgrade cloudsmith-cli"
-        - run: sh -c "pwd; ls; cd build; ls; /bin/bash < upload.sh"
-
-  build-armhf-debian-bullseye:
-        machine:
-            image: ubuntu-2004:202104-01
-        environment:
-        - OCPN_TARGET=bullseye-armhf
-        - DOCKER_IMAGE=arm32v7/debian:bullseye-backports
-        - BUILD_FLAGS=-j3
-        - BUILD_ENV=debian
-        - BUILD_GTK3: true
-        steps:
-        - checkout
-        - run: chmod a+x ./ci/*.sh
-        - run:
-            command: ci/circleci-build-debian-armxx.sh
-            no_output_timeout: 30m
-        - run: sh -c "python3 -m pip install --user --upgrade -q setuptools wheel pip"
-        - run: sh -c "python3 -m pip install --user -q cloudsmith-cli cryptography"
-        - run: sh -c "pip install --upgrade cloudsmith-cli"
-        - run: sh -c "pwd; ls; cd build; ls; /bin/bash < upload.sh"
+      - run: ci/maybe-push-upload.sh
 
 std-filters: &std-filters
   filters:
@@ -219,41 +244,47 @@ workflows:
       - build-flatpak-arm64:
           <<: *std-filters
 
-      - build-flatpak-x86-2008:
+      - build-flatpak-x86:
           <<: *std-filters
 
       - build-macos:
           <<: *std-filters
 
-      - build-bionic-gtk3:
+      - build-android-arm64:
           <<: *std-filters
 
-      - build-bionic:
+      - build-android-armhf:
           <<: *std-filters
 
-      - build-focal:
+      - build-bullseye-wx32:
           <<: *std-filters
 
-      - build-jammy:
+      - build-bullseye-wx32-arm64:
           <<: *std-filters
 
-      - build-buster:
+      - build-bullseye-wx32-armhf:
           <<: *std-filters
 
-      - build-android-arm64:
+      - build-bullseye:
           <<: *std-filters
 
-      - build-android-armhf:
+      - build-bullseye-armhf:
+          <<: *std-filters
+
+      - build-bullseye-arm64:
           <<: *std-filters
 
-      - build-bionic-armhf:
+      - build-bookworm-arm64:
           <<: *std-filters
 
-      - build-focal-armhf:
+      - build-bookworm-armhf:
           <<: *std-filters
 
-      - build-arm64-debian-bullseye:
+      - build-bookworm:
+          <<: *std-filters
+
+      - build-buster:
           <<: *std-filters
 
-      - build-armhf-debian-bullseye:
+      - build-buster-armhf:
           <<: *std-filters

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "opencpn-libs"]
+	path = opencpn-libs
+	url = https://github.com/leamas/opencpn-libs.git