Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ae0a188
PM-227 Fixed MacOS builds for intel using Rosetta2
MostafaNanticock Apr 18, 2026
514248c
PM-227 Fixed incorrect ctest flags for intel builds
MostafaNanticock Apr 18, 2026
ba4d612
PM-227 Simplified Intel Build process
MostafaNanticock Apr 18, 2026
2cffd55
PM-227 build pipeline structure cleanup phase1
MostafaNanticock Apr 18, 2026
8fe8c47
PM-227 build pipeline structure cleanup phase2
MostafaNanticock Apr 18, 2026
573fba3
PM-227 build pipeline structure cleanup phase3
MostafaNanticock Apr 18, 2026
84dec7d
PM-227 Fixed MacOS builds for intel
MostafaNanticock Apr 18, 2026
3ce080f
PM-227 Fixed Qt6 failed builds on MacOS for intel
MostafaNanticock Apr 18, 2026
d12c8b7
PM-227 Fix for failed builds on MacOS-intel
MostafaNanticock Apr 18, 2026
058ccb3
PM-227 macos CI: enable x86_64 Qt via Rosetta
MostafaNanticock Apr 18, 2026
d60ed4d
PM-227 Change CMake Configure step to use bash
MostafaNanticock Apr 18, 2026
20f41e0
PM-227 Used macos-26-intel to build for intel on MacOS
MostafaNanticock Apr 18, 2026
431614e
PM-227 Add cmake_extra_flags and weak-link AGL on macOS
MostafaNanticock Apr 18, 2026
54ba9c6
PM-227 Install Qt via aqtinstall and strip AGL refs
MostafaNanticock Apr 18, 2026
294a6cc
Update macos.yml
MostafaNanticock Apr 18, 2026
e73049b
PM-227 Remove Qt6 for MacOs-intel for now
MostafaNanticock Apr 18, 2026
f8cfbe9
PM-227 Support building against qt6 intel on macos-latest
MostafaNanticock Apr 18, 2026
8d54b36
Update macos.yml
MostafaNanticock Apr 18, 2026
291c89f
Update macos.yml
MostafaNanticock Apr 18, 2026
de57ab6
PM-227 Fix CI: use qt_arch:clang_64 on macos-latest for intel builds
MostafaNanticock Apr 18, 2026
540f20d
Add setup_env_script input and macOS setup
MostafaNanticock Apr 18, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/_build-shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ on:
qt_version:
required: true
type: string
qt_arch: # get rid of this, eventually, by detecting the correct Qt architecture based on the OS and compiler-
description: Qt architecture passed to jurplel/install-qt-action (e.g. clang_64 for macOS Intel).
required: false
type: string
default: ''
setup_env_script:
description: >
Optional shell script run after Qt is installed and before CMake configure.
Use this to configure the build environment (e.g. install Rosetta, export
CMAKE_OSX_ARCHITECTURES). When omitted the step is skipped entirely.
required: false
type: string
default: ''

jobs:
build:
Expand All @@ -27,10 +40,16 @@ jobs:
shell: bash
run: echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"

- name: Set up environment
if: ${{ inputs.setup_env_script }}
shell: bash
run: ${{ inputs.setup_env_script }}

- name: Install Qt
uses: jurplel/install-qt-action@v4
with:
version: ${{ inputs.qt_version }}
arch: ${{ inputs.qt_arch }}
install-deps: 'true'
set-env: 'true'

Expand All @@ -40,6 +59,7 @@ jobs:
-DCMAKE_C_COMPILER=${{ inputs.c_compiler }}
-DCMAKE_CXX_COMPILER=${{ inputs.cpp_compiler }}
-DCMAKE_BUILD_TYPE=Release
${{ steps.strings.outputs.osx_arch_flag }}
-S ${{ github.workspace }}

- name: Build
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

pull_request:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

jobs:
get-matrix:
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

pull_request:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

jobs:
get-matrix:
Expand All @@ -32,10 +34,15 @@ jobs:

uses: ./.github/workflows/_build-shared.yml
with:
os: macos-13 # Intel-based macOS
os: macos-latest # ARM runner; Intel x86_64 binaries built and run via Rosetta 2
c_compiler: ${{ matrix.c_compiler }}
cpp_compiler: ${{ matrix.cpp_compiler }}
qt_version: ${{ matrix.qt_version }}
qt_arch: clang_64 # x86_64 Qt binary for Intel cross-compilation
setup_env_script: |
# Install Rosetta 2 so x86_64 test binaries can run on the ARM64 runner.
softwareupdate --install-rosetta --agree-to-license || true
echo "CMAKE_OSX_ARCHITECTURES=x86_64" >> "$GITHUB_ENV"

build-macos-arm:
name: macos-${{ matrix.c_compiler }}-qt${{ matrix.qt_version }}-arm
Expand All @@ -51,7 +58,7 @@ jobs:
- c_compiler: clang
cpp_compiler: clang++
exclude:
# Exclude Qt5 versions for ARM builds
# Qt5 has no native Apple Silicon (ARM64) support; ARM macOS binaries require Qt6+
- qt_version: "5.9.*"
- qt_version: "5.12.*"
- qt_version: "5.15.*"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@ on:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

pull_request:
branches: [main, develop]
paths-ignore:
- '*.md'
- 'docs/**'

jobs:
get-matrix:
Expand Down
Loading