Merge branch 'COVESA:master' into master

bunty95 · Jun 10, 2024 · 1a1c2ee · 1a1c2ee
2 parents a1a6bed + afb9316
commit 1a1c2ee
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.github/release.yml b/.github/release.yml
@@ -11,6 +11,9 @@ changelog:
     - title: Exciting New Features 🎉
       labels:
         - enhancement
+    - title: Build pipeline 🛠
+      labels:
+        - Build pipeline
     - title: Other Changes
       labels:
         - "*"
diff --git a/.github/workflows/BuildPR.yml b/.github/workflows/BuildPR.yml
@@ -13,6 +13,7 @@ jobs:
     name: Build macOS
     runs-on: ${{ matrix.macos }}
     strategy:
+      fail-fast: false
       matrix:
         macos: [ macos-13 ]
         xcode: [ Xcode_15.2 ]

diff --git a/INSTALL.md b/INSTALL.md
@@ -106,8 +106,12 @@ For MacOS, you can install Qt with Homebrew:
 brew install qt
 
 Then give the Qt directory to CMake and build:
+#### x86:
 * Qt5_DIR="/usr/local/opt/qt" cmake src_path/
 * make
+#### arm64:
+* Qt5_DIR="/opt/homebrew/opt/qt5" cmake src_path/
+* make
 
 The application is built in "bin/DLT Viewer.app", it can be launched from Finder or the command line:
 open -a $DLT_BUILD_DIR/bin/DLT\ Viewer.app

diff --git a/scripts/darwin/build.sh b/scripts/darwin/build.sh
@@ -11,8 +11,8 @@ rm -rf "${SRC_DIR}/build"
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
-echo Build with QMake
 Qt5_DIR="/usr/local/opt/qt"
+echo "Run on MacOS $(uname -m) Qt5_DIR=$Qt5_DIR"
 qmake ../BuildDltViewer.pro
 make