macOS

Author: nohal

.circleci/config.yml

@@ -192,19 +192,33 @@ jobs:
         default: "fp-x86-20-v2"
     <<: *flatpak-steps
 
-  #build-macos:
-  #  macos:
-  #    xcode: "12.5.1"
-  #  environment:
-  #    - OCPN_TARGET: macos
-  #    - CMAKE_BUILD_PARALLEL_LEVEL: 2
-  #  steps:
-  #    - checkout
-  #    - run: ci/circleci-build-macos.sh
-  #    - run: >
-  #        sh -c "otool -L build-osx/app/*/OpenCPN.app/Contents/PlugIns/*.dylib"
-  #    - run: cd build-osx; /bin/bash < upload.sh
-  #    - run: ci/git-push.sh  build-osx
+  build-macos:
+    macos:
+      xcode: "12.5.1"
+    environment:
+      - OCPN_TARGET: macos
+      - CMAKE_BUILD_PARALLEL_LEVEL: 2
+    steps:
+      - checkout
+      - run: sudo chmod go+w /usr/local
+      - restore_cache:
+          key: "{{checksum \"build-deps/macos-cache-stamp\"}}\
+            -{{checksum \"cmake/MacosWxwidgets.cmake\"}}\
+            -{{checksum \"ci/circleci-build-macos.sh\"}}"
+      - run: ci/circleci-build-macos.sh
+      - save_cache:
+          key: "{{checksum \"build-deps/macos-cache-stamp\"}}\
+            -{{checksum \"cmake/MacosWxwidgets.cmake\"}}\
+            -{{checksum \"ci/circleci-build-macos.sh\"}}"
+          paths:
+            - /tmp/local.cache.tar
+            - /Users/distiller/project/cache
+      - run: >
+          sh -c "otool -L build-osx/app/*/OpenCPN.app/Contents/PlugIns/*.dylib"
+      - run: ci/verify-result.sh build-osx
+      - run: cd build-osx; /bin/bash < upload.sh
+      - run: ci/git-push.sh  build-osx
+
 
   #TODO: wxStyledTextCtrl does not exist in wxQT, so we would have to replace it.
   #      And there will be more for sure.
@@ -250,9 +264,9 @@ workflows:
       - build-flatpak-x86:
           <<: *std-filters
 
-#      - build-macos:
-#          <<: *std-filters
-#
+      - build-macos:
+          <<: *std-filters
+
 #      - build-android-arm64:
 #          <<: *std-filters
 #

.github/workflows/macos.yml

@@ -34,15 +34,15 @@ jobs:
             cmake_defines: -DCMAKE_CXX_STANDARD=17
             use_homebrew: 1
             push_cloudsmith: 0
-          - name: macOS 11 wxOSX
-            runner: macos-11
-            cmake_generator: Xcode
-            cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010"
-            push_cloudsmith: 1
-          - name: macOS 10.15 wxOSX
-            runner: macos-10.15
-            cmake_generator: Xcode
-            cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010"
+          #- name: macOS 11 wxOSX
+          #  runner: macos-11
+          #  cmake_generator: Xcode
+          #  cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010"
+          #  push_cloudsmith: 1
+          #- name: macOS 10.15 wxOSX
+          #  runner: macos-10.15
+          #  cmake_generator: Xcode
+          #  cmake_defines: -DCMAKE_CXX_STANDARD=11 -DwxWidgets_CONFIG_EXECUTABLE=/tmp/wx322-2_opencpn50_macos1010/bin/wx-config -DwxWidgets_CONFIG_OPTIONS="--prefix=/tmp/wx322-2_opencpn50_macos1010"
 
     env:
       wxGTK_VERSION: ${{ matrix.gtk_version && matrix.gtk_version || 3 }}