Merge pull request #2385 from srcejon/mac_ci

Update Mac Github actions
f4exb · Jan 23, 2025 · d7863b2 · d7863b2
2 parents 6ded8f0 + d524bf2
commit d7863b2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -9,12 +9,16 @@ on:
 
 jobs:
   build_mac_x64:
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           fetch-depth: 0
+      - name: Update brew
+        run: brew update
+      - name: Install brew packages
+        run: brew install nasm subversion
       - name: Install SDRplay API
         run: |
             wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.15.0.pkg
@@ -40,7 +44,23 @@ jobs:
       - name: Build SDRangel on Mac
         run: |
           cd build
-          make -j4 package
+          make -j4
+      - name: Create dmg
+        run: |
+          cd build
+          RETRIES=5
+          COUNT=1
+          set +e
+          while [ $COUNT -lt $RETRIES ]; do
+            make package
+            if [ $? -eq 0 ]; then
+              RETRIES=0
+              break
+            fi
+            let COUNT=$COUNT+1
+          done
+        shell: bash
+        continue-on-error: true
       - name: Get version
         id: get_version
         run: |
@@ -99,7 +119,23 @@ jobs:
       - name: Build SDRangel on Mac
         run: |
           cd build
-          make -j3 package
+          make -j3
+      - name: Create dmg
+        run: |
+          cd build
+          RETRIES=5
+          COUNT=1
+          set +e
+          while [ $COUNT -lt $RETRIES ]; do
+            make package
+            if [ $? -eq 0 ]; then
+              RETRIES=0
+              break
+            fi
+            let COUNT=$COUNT+1
+          done
+        shell: bash
+        continue-on-error: true
       - name: Get version
         id: get_version
         run: |

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -420,6 +420,7 @@ if (NOT FFMPEG_FOUND AND NOT USE_PRECOMPILED_LIBS)
     if (NOT X265_FOUND OR X265_EXTERNAL)
         ExternalProject_Add(x265
             GIT_REPOSITORY https://bitbucket.org/multicoreware/x265_git.git
+            GIT_TAG 4.1
             PREFIX "${EXTERNAL_BUILD_LIBRARIES}/x265"
             SOURCE_SUBDIR "source"
             CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>