Commit 32863a1
committed
Upgrade CI and fix satisfy matcher
1 parent 384040c commit 32863a1
2 files changed
Lines changed: 15 additions & 15 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -16,12 +16,12 @@ jobs: | |||
| 16 | 16 | strategy: | |
| 17 | 17 | fail-fast: false | |
| 18 | 18 | matrix: | |
| 19 | - compiler: [native, llvm-18, gcc-14] | ||
| 20 | - os: [ubuntu-latest, windows-latest, macos-13, macos-15] | ||
| 19 | + compiler: [native, llvm-20, gcc-14] | ||
| 20 | + os: [ubuntu-latest, windows-latest, macos-14, macos-15] | ||
| 21 | 21 | exclude: | |
| 22 | 22 | - os: windows-latest | |
| 23 | 23 | compiler: gcc-14 | |
| 24 | - - os: macos-13 | ||
| 24 | + - os: macos-14 | ||
| 25 | 25 | compiler: native # AppleClang is too old | |
| 26 | 26 | ||
| 27 | 27 | steps: | |
@@ -33,17 +33,17 @@ jobs: | |||
| 33 | 33 | ||
| 34 | 34 | - name: Install Clang | |
| 35 | 35 | run: | | |
| 36 | - brew install llvm@18 | ||
| 37 | - brew link --force --overwrite llvm@18 | ||
| 38 | - echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV | ||
| 39 | - echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV | ||
| 40 | - if: ${{ matrix.compiler == 'llvm-18' && (matrix.os == 'macos-13' || matrix.os == 'macos-15') }} | ||
| 36 | + brew install llvm@20 | ||
| 37 | + brew link --force --overwrite llvm@20 | ||
| 38 | + echo "CC=$(brew --prefix llvm@20)/bin/clang" >> $GITHUB_ENV | ||
| 39 | + echo "CXX=$(brew --prefix llvm@20)/bin/clang++" >> $GITHUB_ENV | ||
| 40 | + if: ${{ matrix.compiler == 'llvm-20' && (matrix.os == 'macos-14' || matrix.os == 'macos-15') }} | ||
| 41 | 41 | ||
| 42 | 42 | - name: Use LLVM and Clang | |
| 43 | 43 | run: | | |
| 44 | - echo "CC=clang-18" >> $GITHUB_ENV | ||
| 45 | - echo "CXX=clang++-18" >> $GITHUB_ENV | ||
| 46 | - if: ${{ matrix.compiler == 'llvm-18' && (matrix.os != 'macos-13' && matrix.os != 'macos-15') }} | ||
| 44 | + echo "CC=clang-20" >> $GITHUB_ENV | ||
| 45 | + echo "CXX=clang++-20" >> $GITHUB_ENV | ||
| 46 | + if: ${{ matrix.compiler == 'llvm-20' && (matrix.os != 'macos-14' && matrix.os != 'macos-15') }} | ||
| 47 | 47 | ||
| 48 | 48 | - name: Use GCC | |
| 49 | 49 | run: | | |
@@ -53,11 +53,11 @@ jobs: | |||
| 53 | 53 | ||
| 54 | 54 | - name: Configure | |
| 55 | 55 | run: cmake -B build -DCPPSPEC_BUILD_TESTS=YES | |
| 56 | - if: ${{ matrix.compiler != 'llvm-18' || matrix.os != 'windows-latest' }} | ||
| 56 | + if: ${{ matrix.compiler != 'llvm-20' || matrix.os != 'windows-latest' }} | ||
| 57 | 57 | ||
| 58 | 58 | - name: Configure ClangCL | |
| 59 | 59 | run: cmake -B build -DCPPSPEC_BUILD_TESTS=YES -G "Visual Studio 17 2022" -T ClangCL | |
| 60 | - if: ${{ matrix.compiler == 'llvm-18' && matrix.os == 'windows-latest' }} | ||
| 60 | + if: ${{ matrix.compiler == 'llvm-20' && matrix.os == 'windows-latest' }} | ||
| 61 | 61 | ||
| 62 | 62 | - name: Build | |
| 63 | 63 | run: cmake --build build --config Release | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,12 +33,12 @@ class Satisfy : public MatcherBase<A, bool> //, BeHelpers<Satisfy<A>> | |||
| 33 | 33 | ||
| 34 | 34 | template <typename A> | |
| 35 | 35 | std::string Satisfy<A>::failure_message() { | |
| 36 | - return std::format("expected {} to evaluate to true", MatcherBase<A, bool>::actual()); | ||
| 36 | + return std::format("expected {} to evaluate to true", Pretty::to_word(MatcherBase<A, bool>::actual())); | ||
| 37 | 37 | } | |
| 38 | 38 | ||
| 39 | 39 | template <typename A> | |
| 40 | 40 | std::string Satisfy<A>::failure_message_when_negated() { | |
| 41 | - return std::format("expected {} to evaluate to false", MatcherBase<A, bool>::actual()); | ||
| 41 | + return std::format("expected {} to evaluate to false", Pretty::to_word(MatcherBase<A, bool>::actual())); | ||
| 42 | 42 | } | |
| 43 | 43 | ||
| 44 | 44 | template <typename A> | |
0 commit comments