Skip to content

Commit 5809870

Browse files
committed
Add macos-15 as a test environment
1 parent c9915fc commit 5809870

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

Diff for: .github/workflows/ci.yml

+16-4
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ jobs:
5353
strategy:
5454
fail-fast: ${{ github.event_name == 'merge_group' }}
5555
matrix:
56-
# smoelius: Test with `macos-latest` once the repository is made public.
57-
environment: [ubuntu-latest]
56+
environment: [ubuntu-latest, macos-15]
5857
# smoelius: Test with Anchor 0.31.0 once the following issue is resolved:
5958
# https://github.com/solana-foundation/anchor/issues/3643
6059
anchor-version: [0.30.1]
@@ -89,9 +88,20 @@ jobs:
8988
- name: Rustup
9089
run: rustup update
9190

92-
- name: Install Agave prerequisites
91+
- name: Install Agave prerequisites on Ubuntu
92+
if: ${{ matrix.environment == 'ubuntu-latest' }}
9393
run: sudo apt install libclang-dev libudev-dev llvm protobuf-compiler
9494

95+
- name: Install Agave prerequisites on macOS
96+
if: ${{ matrix.environment == 'macos-15' }}
97+
run: |
98+
brew install coreutils gnu-sed llvm protobuf
99+
echo "/opt/homebrew/opt/gnu-sed/libexec/gnubin" >> "$GITHUB_PATH"
100+
# smoelius: ~/lib is one of the directories `librocksdb-sys`'s build script checks
101+
# for libclang.dylib.
102+
mkdir ~/lib
103+
ln -s /opt/homebrew/opt/llvm/lib/libclang.dylib ~/lib/libclang.dylib
104+
95105
- name: Install Agave
96106
run: |
97107
if ! ./agave/bin/agave-validator --version; then
@@ -130,7 +140,9 @@ jobs:
130140
131141
# https://github.com/actions/cache/tree/main/save#always-save-cache
132142
- uses: actions/cache/save@v4
133-
if: always() && steps.cache-restore.outputs.cache-hit != 'true'
143+
# smoelius: The cache should be updated regardless of whether it was restored in case
144+
# further progress is made.
145+
if: always() # && steps.cache-restore.outputs.cache-hit != 'true'
134146
with:
135147
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
136148
path: |

0 commit comments

Comments
 (0)