Skip to content

Commit 8650530

Browse files
committed
Fix build pipeline
1 parent 3e75d83 commit 8650530

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

.github/workflows/clang.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
env:
22
CTEST_OUTPUT_ON_FAILURE: 1
3+
LIBCXX_STANDARDS_JSON: '["20","23"]'
34

45
on:
56
workflow_call:
@@ -30,15 +31,17 @@ jobs:
3031
run: sudo apt-get install -y clang-${{ matrix.version }}
3132

3233
- name: Install libc++ Clang ${{ matrix.version }}
33-
if: matrix.standard == '20'
34+
if: contains(fromJson(env.LIBCXX_STANDARDS_JSON), matrix.standard)
3435
run: sudo apt-get install -y libc++-${{ matrix.version }}-dev libc++abi-${{ matrix.version }}-dev
3536

3637
- name: Configure (install)
3738
env:
3839
CC: clang-${{ matrix.version }}
3940
CXX: clang-${{ matrix.version }}
4041
run: |
41-
if [ "${{ matrix.standard }}" = "20" ]; then
42+
sudo apt-get update && sudo apt-get install -y jq
43+
STDS=$(echo '${{ env.LIBCXX_STANDARDS_JSON }}' | jq -r '.[]' | xargs)
44+
if echo "$STDS" | grep -wq "${{ matrix.standard }}"; then
4245
CXX_FLAGS='-stdlib=libc++'
4346
else
4447
CXX_FLAGS=''

src/lz.cppm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ export module lz;
6161
#include "Lz/interleave.hpp"
6262
#include "Lz/intersection.hpp"
6363
#include "Lz/iter_tools.hpp"
64-
#include "Lz/iterator_base.hpp"
6564
#include "Lz/join_where.hpp"
6665
#include "Lz/loop.hpp"
6766
#include "Lz/map.hpp"

0 commit comments

Comments
 (0)