Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b7f053d

Browse files
committedJun 3, 2024··
fixup! ci: Migrate CI scripts to CMake
Test old Boost on macOS
1 parent 6230d47 commit b7f053d

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed
 

‎.github/workflows/cmake.yml

+13-7
Original file line numberDiff line numberDiff line change
@@ -526,11 +526,17 @@ jobs:
526526
strategy:
527527
fail-fast: false
528528
matrix:
529-
os:
529+
conf:
530530
- name: 'macOS 13 native, x86_64'
531531
os: macos-13
532+
boost_package: 'boost'
533+
- name: 'macOS 14 native, arm64'
534+
os: macos-14
535+
boost_package: 'boost'
532536
- name: 'macOS 14 native, arm64'
533537
os: macos-14
538+
boost_package: 'boost@1.76'
539+
build_options: '-DBoost_INCLUDE_DIR=/opt/homebrew/opt/boost@1.76/include'
534540
xcode:
535541
- name: 'Xcode 15.2'
536542
id: 'xcode-15.2'
@@ -546,7 +552,7 @@ jobs:
546552
clang --version
547553
548554
- name: Workaround for Homebrew python link
549-
if: matrix.os.os == 'macos-13'
555+
if: matrix.conf.os == 'macos-13'
550556
env:
551557
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
552558
run: |
@@ -556,7 +562,7 @@ jobs:
556562
env:
557563
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
558564
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
560566
echo "CCACHE_DIR=${{ runner.temp }}/ccache" >> "$GITHUB_ENV"
561567
562568
- name: CMake version
@@ -569,12 +575,12 @@ jobs:
569575
id: ccache-cache
570576
with:
571577
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-
574580

575581
- name: Generate build system
576582
run: |
577-
cmake -B build --preset ci-darwin
583+
cmake -B build --preset ci-darwin ${{ matrix.conf.build_options }}
578584
579585
- name: Build
580586
env:
@@ -593,7 +599,7 @@ jobs:
593599
if: github.event_name != 'pull_request' && steps.ccache-cache.outputs.cache-hit != 'true'
594600
with:
595601
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 }}
597603

598604
- name: Test
599605
run: |

0 commit comments

Comments
 (0)
Please sign in to comment.