Merge pull request #235 from jongough/updates

Updates

.circleci/config.yml

@@ -22,6 +22,8 @@ workflows:
             <<: *std-filters
         - build-armhf-buster:
             <<: *std-filters
+        - build-armhf-bullseye:
+            <<: *std-filters
 ## Currently circleci does not build armf64 correctly due to no suitable docker image
 ##        - build-armhf-bionic-64:
 ##            <<: *std-filters
@@ -129,6 +131,23 @@ jobs:
             command: ci/circleci-build-raspbian-armhf.sh
             no_output_timeout: 30m
         - deploy-code
+    build-armhf-bullseye:
+        machine:
+            image: ubuntu-2004:202104-01
+        environment:
+        - OCPN_TARGET=bullseye-armhf
+        - DOCKER_IMAGE=balenalib/raspberry-pi-debian:bullseye
+        - BUILD_FLAGS=-j3
+        - BUILD_ENV=raspbian
+        - BUILD_GTK3: true
+        - DEPLOY_USE_ORB: true
+        steps:
+        - checkout
+        - run: chmod a+x ./ci/*.sh
+        - run:
+            command: ci/circleci-build-raspbian-armhf.sh
+            no_output_timeout: 30m
+        - deploy-code
     build-armhf-bionic-64:
         machine:
             image: ubuntu-2004:202104-01

CMakeLists.txt

@@ -39,7 +39,7 @@ set(LONG_DESCRIPTION "testplugin Plugin is used to test out the ODraw API and de
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "0")
-set(VERSION_PATCH "185")
+set(VERSION_PATCH "186")
 set(VERSION_TWEAK "0")
 set(VERSION_DATE "09/12/2021") # DD/MM/YYYY format
 set(OCPN_MIN_VERSION "ov50")

ci/circleci-build-raspbian-armhf.sh

@@ -48,15 +48,26 @@ EOF
         install_packages cmake cmake-data
 EOF1
     fi
-    cat >> build.sh << "EOF2"
-    install_packages git build-essential devscripts equivs gettext wx-common libgtk2.0-dev libwxbase3.0-dev libwxgtk3.0-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release
+    if [ "$OCPN_TARGET" = "bullseye-armhf" ]; then
+        cat >> build.sh << "EOF2"
+        curl http://mirrordirector.raspbian.org/raspbian.public.key  | apt-key add -
+        curl http://archive.raspbian.org/raspbian.public.key  | apt-key add -
+        sudo apt -q update
+        sudo apt install devscripts equivs wget git lsb-release
+        sudo mk-build-deps -ir ci-source/ci/control
+        sudo apt-get --allow-unauthenticated install -f
 EOF2
+    else
+    cat >> build.sh << "EOF3"
+    install_packages git build-essential devscripts equivs gettext wx-common libgtk2.0-dev libwxbase3.0-dev libwxgtk3.0-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release
+EOF3
+    fi
 else
-    cat > build.sh << "EOF3"
+    cat > build.sh << "EOF4"
     apt-get -qq update
     apt-get -y install --no-install-recommends \
     git cmake build-essential gettext wx-common libgtk2.0-dev libwxbase3.0-dev libwxgtk3.0-dev libbz2-dev libcurl4-openssl-dev libexpat1-dev libcairo2-dev libarchive-dev liblzma-dev libexif-dev lsb-release
-EOF3
+EOF4
 fi
 
 cat build.sh
@@ -67,7 +78,7 @@ then
 fi
 
 docker exec -ti \
-    $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe /ci-source/build.sh; rm -rf ci-source/build; mkdir ci-source/build; cd ci-source/build; cmake ..; make $BUILD_FLAGS; make package; chmod -R a+rw ../build;"
+    $DOCKER_CONTAINER_ID /bin/bash -xec "bash -xe ci-source/build.sh; rm -rf ci-source/build; mkdir ci-source/build; cd ci-source/build; cmake ..; make $BUILD_FLAGS; make package; chmod -R a+rw ../build;"
 
 echo "Stopping"
 docker ps -a