Skip to content

Commit 989c549

Browse files
committed
Fix CI
1 parent 88deec4 commit 989c549

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Diff for: .github/workflows/build.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ jobs:
5858
boost-version: '1.80.0'}
5959

6060
# macOS builds
61-
- {os: macos-latest, compiler: clang}
61+
# FIXME: Remove -Wno-deprecated flag.
62+
- {os: macos-latest, compiler: clang, flags: '-Wno-deprecated'}
6263

6364
# C++20 builds
6465
- {os: ubuntu-latest, compiler: gcc, version: '13',
@@ -110,7 +111,9 @@ jobs:
110111
- name: Install macOS dependencies
111112
if: startsWith(matrix.os, 'macos-')
112113
run: |
113-
brew install ninja pkg-config boost
114+
brew install boost ninja pkg-config
115+
echo "CPATH=/opt/homebrew/include" >> ${GITHUB_ENV}
116+
echo "LIBRARY_PATH=/opt/homebrew/lib" >> ${GITHUB_ENV}
114117
- name: Install Boost ${{ matrix.boost-version }} from source
115118
if: "!startsWith(matrix.os, 'windows-') && matrix.boost-version"
116119
run: |
@@ -172,7 +175,7 @@ jobs:
172175
ninja install
173176
popd
174177
echo "PATH=${HOME}/bin:${PATH}" >> ${GITHUB_ENV}
175-
echo "CPATH=${HOME}/include" >> ${GITHUB_ENV}
178+
echo "CPATH=${HOME}/include:${CPATH}" >> ${GITHUB_ENV}
176179
echo "PKG_CONFIG_PATH=${HOME}/lib/pkgconfig" >> ${GITHUB_ENV}
177180
echo "CXXFLAGS=${COMMONFLAGS} ${{ matrix.flags }}" >> ${GITHUB_ENV}
178181
- name: Build mettle (Windows)

Diff for: build.bfg

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ install(includes)
1212
test_files = find_paths('test/**/*.cpp')
1313

1414
try:
15+
boost = package('boost')
1516
libmettle = package('mettle')
1617
mettle = test_driver(['mettle', '--output=verbose'])
1718

@@ -20,7 +21,7 @@ try:
2021
src.stripext().suffix,
2122
files=src,
2223
includes=includes,
23-
packages=[libmettle]
24+
packages=[boost, libmettle]
2425
), driver=mettle)
2526
except PackageResolutionError:
2627
warning('mettle not found; tests disabled')

0 commit comments

Comments
 (0)