Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
jimporter committed May 2, 2024
1 parent 88deec4 commit 989c549
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@ jobs:
boost-version: '1.80.0'}

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

# C++20 builds
- {os: ubuntu-latest, compiler: gcc, version: '13',
Expand Down Expand Up @@ -110,7 +111,9 @@ jobs:
- name: Install macOS dependencies
if: startsWith(matrix.os, 'macos-')
run: |
brew install ninja pkg-config boost
brew install boost ninja pkg-config
echo "CPATH=/opt/homebrew/include" >> ${GITHUB_ENV}
echo "LIBRARY_PATH=/opt/homebrew/lib" >> ${GITHUB_ENV}
- name: Install Boost ${{ matrix.boost-version }} from source
if: "!startsWith(matrix.os, 'windows-') && matrix.boost-version"
run: |
Expand Down Expand Up @@ -172,7 +175,7 @@ jobs:
ninja install
popd
echo "PATH=${HOME}/bin:${PATH}" >> ${GITHUB_ENV}
echo "CPATH=${HOME}/include" >> ${GITHUB_ENV}
echo "CPATH=${HOME}/include:${CPATH}" >> ${GITHUB_ENV}
echo "PKG_CONFIG_PATH=${HOME}/lib/pkgconfig" >> ${GITHUB_ENV}
echo "CXXFLAGS=${COMMONFLAGS} ${{ matrix.flags }}" >> ${GITHUB_ENV}
- name: Build mettle (Windows)
Expand Down
3 changes: 2 additions & 1 deletion build.bfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ install(includes)
test_files = find_paths('test/**/*.cpp')

try:
boost = package('boost')
libmettle = package('mettle')
mettle = test_driver(['mettle', '--output=verbose'])

Expand All @@ -20,7 +21,7 @@ try:
src.stripext().suffix,
files=src,
includes=includes,
packages=[libmettle]
packages=[boost, libmettle]
), driver=mettle)
except PackageResolutionError:
warning('mettle not found; tests disabled')
Expand Down

0 comments on commit 989c549

Please sign in to comment.