Update Github Actions CI (Add macos-13, and fix nproc)

vtnerd · Jun 26, 2024 · 0ac3088 · 0ac3088
1 parent 567c1a5
commit 0ac3088
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "master", "develop", "release-*" ]
   pull_request:
-    branches: [ "master", "develop" ]
+    branches: [ "master", "develop", release-* ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -20,7 +20,7 @@ jobs:
     runs-on: ${{matrix.os}}
     strategy:
       matrix:
-        os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04, macos-latest, macos-12]
+        os: [ubuntu-latest, ubuntu-22.04, ubuntu-20.04, macos-latest, macos-13, macos-12]
         rmq: [WITH_RMQ=ON, WITH_RMQ=OFF]
     steps:
     - name: set apt conf (Debian based Linux)
@@ -37,10 +37,12 @@ jobs:
       run: sudo apt -y install librabbitmq-dev
 
     - name: Install dependencies (MacOS)
-      if: matrix.os == 'macos-latest' || matrix.os == 'macos-12' || matrix.os == 'macos-11'
-      run: HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf
+      if: matrix.os == 'macos-latest' || matrix.os == 'macos-12' || matrix.os == 'macos-13'
+      run: |
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install boost hidapi openssl zmq libpgm miniupnpc expat libunwind-headers protobuf
+        alias nproc="sysctl -n hw.logicalcpu"
     - name: Install RabbitMQ iff WITH_RMQ (MacOS)
-      if: matrix.rmq == 'WITH_RMQ=ON' && (matrix.os == 'macos-latest' || matrix.os == 'macos-12' || matrix.os == 'macos-11')
+      if: matrix.rmq == 'WITH_RMQ=ON' && (matrix.os == 'macos-latest' || matrix.os == 'macos-12' || matrix.os == 'macos-13')
       run: HOMEBREW_NO_AUTO_UPDATE=1 brew install rabbitmq-c
 
     - name: Checkout Monero Source