Skip to content

Commit def6e4c

Browse files
committed
gha: build - macOS ARM Qt install
1 parent 8ef1290 commit def6e4c

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
os: [macos-13, ubuntu-latest, ubuntu-20.04, ubuntu-24.04-arm, windows-latest]
49+
os: [macos-13, macos-latest, ubuntu-latest, ubuntu-20.04, ubuntu-24.04-arm, windows-latest]
5050

5151
steps:
5252

@@ -105,7 +105,7 @@ jobs:
105105
# run: |
106106
# echo "OPENIA_CMAKE_OPTIONS=${{env.OPENIA_CMAKE_OPTIONS}} -DOpenMP_CXX_FLAGS=\"-Xpreprocessor -fopenmp -lomp\" -DOpenMP_CXX_INCLUDE_DIR=\"/opt/homebrew/opt/libomp/include\" -DOpenMP_libomp_LIBRARY=\"/opt/homebrew/opt/libomp/lib/libomp.dylib\"" >> "$GITHUB_ENV"
107107

108-
- if: matrix.os != 'ubuntu-24.04-arm'
108+
- if: ${{ (matrix.os != 'ubuntu-24.04-arm' && matrix.os != 'macos-latest') }}
109109
name: Qt install
110110
# see https://github.com/marketplace/actions/install-qt for details
111111
uses: jurplel/install-qt-action@v4
@@ -124,6 +124,16 @@ jobs:
124124
sudo apt install qt6-base-dev qt6-tools-dev qt6-svg-dev
125125
sudo apt install qt6-charts-dev qt6-httpserver-dev qt6-websockets-dev npm
126126
echo "QT_VERSION=$(/usr/bin/dpkg -s qt6-base-dev | /usr/bin/grep 'Version' | /usr/bin/awk '{ split($2, a, "+"); print a[1]; }')" >> "$GITHUB_ENV"
127+
cat /proc/cpuinfo
128+
129+
- if: matrix.os == 'macos-latest'
130+
name: install macPorts (macOS ARM)
131+
uses: melusina-org/setup-macports@v1
132+
- if: matrix.os == 'macos-latest'
133+
name: Qt install (macOS ARM)
134+
run: |
135+
sudo port install qt6 qt6-qtcharts qt6-qthttpserver qt6-qt6websockets
136+
cat /proc/cpuinfo
127137
128138
##################################################################
129139
# VR: OpenXR, OpenVR, boost

0 commit comments

Comments
 (0)