Merge branch 'OpenCPN:master' into master

Hakansv · Jan 6, 2024 · 2bac948 · 2bac948
2 parents 987d044 + eb5a003
commit 2bac948
Show file tree

Hide file tree

Showing 675 changed files with 164,374 additions and 61,197 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -19,14 +19,14 @@ jobs:
       - run: ci/generic-build-debian.sh
       - run: ci/generic-upload.sh
 
-  build-bionic:
+  build-focal:
     docker:
-      - image: circleci/buildpack-deps:bionic-scm
+      - image: circleci/buildpack-deps:focal-scm
         auth:
           username: $DOCKER_USER
           password: $DOCKER_PW
     environment:
-      - OCPN_TARGET: bionic
+      - OCPN_TARGET: focal
     steps:
       - checkout
       - run: cat /etc/apt/sources.list
@@ -74,7 +74,7 @@ jobs:
 
   build-android-armhf:
     docker:
-      - image: circleci/android:api-28-ndk
+      - image: cimg/android:2023.12-ndk
     environment:
       - OCPN_TARGET: android-armhf
     steps:
@@ -104,7 +104,7 @@ jobs:
 
   build-macos-universal:
     macos:
-      xcode: "13.4.1"
+      xcode: "15.1.0"
     environment:
       - OCPN_TARGET:  macos
       - pkg_mod: 11
@@ -164,7 +164,7 @@ workflows:
       - build-bookworm:
           <<: *std-filters
 
-      - build-bionic:
+      - build-focal:
           <<: *std-filters
 
       - build-jammy:

diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml
@@ -52,6 +52,21 @@ jobs:
         shell: cmd
         run: ci\appveyor.bat
 
+      - name: "Check build results"
+        shell: bash
+        run: |
+          ls -l build/$CONFIGURATION/opencpn.exe || exit 1
+          ls -l build/cli/$CONFIGURATION/opencpn-cmd.exe || exit 1
+          ls -l build/test/$CONFIGURATION/tests.exe || exit 1
+
+      - name: "Run tests"
+        shell: bash
+        run: |
+          set -x
+          cd build
+          cmake --install .
+          cmake --build . --config $CONFIGURATION --target run-tests
+
       - name: Upload
         shell: bash
         run: ci/generic-upload.sh

diff --git a/.github/workflows/zulip.yml b/.github/workflows/zulip.yml
@@ -19,10 +19,13 @@ env:
 jobs:
   on-anything:
     runs-on: ubuntu-latest
+    env:
+      zulip_api_key: ${{ secrets.ZULIP_API_KEY }}
     steps:
       - run: echo "GITHUB_ACTOR=$GITHUB_ACTOR" >> $GITHUB_ENV
       - run: echo "SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
-      - name: Tell Zulip
+      - if: ${{ env.zulip_api_key != ''}} 
+        name: Tell Zulip
         uses: zulip/github-actions-zulip/send-message@v1
         with:
           email: [email protected]