@@ -520,17 +520,23 @@ jobs:
520
520
521
521
522
522
macos-native :
523
- name : ' ${{ matrix.os .name }}, ${{ matrix.xcode.name }}'
523
+ name : ' ${{ matrix.conf .name }}, ${{ matrix.xcode.name }}'
524
524
runs-on : ${{ matrix.os.os }}
525
525
526
526
strategy :
527
527
fail-fast : false
528
528
matrix :
529
- os :
529
+ conf :
530
530
- name : ' macOS 13 native, x86_64'
531
531
os : macos-13
532
+ boost_package : ' boost'
532
533
- name : ' macOS 14 native, arm64'
533
534
os : macos-14
535
+ boost_package : ' boost'
536
+ - name : ' macOS 14 native, arm64, Boost 1.76'
537
+ os : macos-14
538
+ boost_package :
' [email protected] '
539
+ build_options :
' -DBoost_INCLUDE_DIR=/opt/homebrew/opt/[email protected] /include'
534
540
xcode :
535
541
- name : ' Xcode 15.2'
536
542
id : ' xcode-15.2'
@@ -546,7 +552,7 @@ jobs:
546
552
clang --version
547
553
548
554
- name : Workaround for Homebrew python link
549
- if : matrix.os .os == 'macos-13'
555
+ if : matrix.conf .os == 'macos-13'
550
556
env :
551
557
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK : 1
552
558
run : |
@@ -556,7 +562,7 @@ jobs:
556
562
env :
557
563
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK : 1
558
564
run : |
559
- brew install ccache cmake pkg-config boost libevent berkeley-db@4 qt@5 qrencode libnatpmp miniupnpc zeromq tree
565
+ brew install ccache cmake pkg-config ${{ matrix.conf.boost_package }} libevent berkeley-db@4 qt@5 qrencode libnatpmp miniupnpc zeromq tree
560
566
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
561
567
562
568
- name : CMake version
@@ -569,12 +575,12 @@ jobs:
569
575
id : ccache-cache
570
576
with :
571
577
path : ${{ env.CCACHE_DIR }}
572
- key : ${{ matrix.os .os }}-${{ matrix.xcode.id }}-ccache-${{ github.run_id }}
573
- restore-keys : ${{ matrix.os .os }}-${{ matrix.xcode.id }}-ccache-
578
+ key : ${{ matrix.conf .os }}-${{ matrix.xcode.id }}-ccache-${{ github.run_id }}
579
+ restore-keys : ${{ matrix.conf .os }}-${{ matrix.xcode.id }}-ccache-
574
580
575
581
- name : Generate build system
576
582
run : |
577
- cmake -B build --preset ci-darwin
583
+ cmake -B build --preset ci-darwin ${{ matrix.conf.build_options }}
578
584
579
585
- name : Build
580
586
env :
@@ -593,7 +599,7 @@ jobs:
593
599
if : github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
594
600
with :
595
601
path : ${{ env.CCACHE_DIR }}
596
- key : ${{ matrix.os .os }}-${{ matrix.xcode.id }}-ccache-${{ github.run_id }}
602
+ key : ${{ matrix.conf .os }}-${{ matrix.xcode.id }}-ccache-${{ github.run_id }}
597
603
598
604
- name : Test
599
605
run : |
0 commit comments