Skip to content

Commit ee0caab

Browse files
committed
WIP v7 compilers without egor-tensin
1 parent 69afcc0 commit ee0caab

File tree

1 file changed

+9
-44
lines changed

1 file changed

+9
-44
lines changed

.github/workflows/linux.yaml

Lines changed: 9 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -44,54 +44,19 @@ jobs:
4444
- name: Test installation
4545
run: cmake --install _build --prefix ${GITHUB_WORKSPACE}/_built
4646

47-
GCC-7:
48-
runs-on: ubuntu-20.04
49-
env:
50-
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
51-
CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
52-
steps:
53-
- uses: egor-tensin/setup-gcc@v1
54-
with:
55-
version: 7
56-
57-
- name: Get pushed code
58-
uses: actions/checkout@v4
59-
60-
- name: Checkout libebml
61-
uses: actions/checkout@v4
62-
with:
63-
repository: Matroska-Org/libebml
64-
path: libebml
65-
# minimum version we support ref: 'release-1.4.3'
66-
67-
- name: Configure libebml
68-
run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }}
69-
70-
- name: Build libebml
71-
run: cmake --build libebml/_build --parallel
72-
73-
- name: Install libebml
74-
run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built
75-
76-
- name: Configure
77-
run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
78-
79-
- name: Build
80-
run: cmake --build _build --parallel
81-
82-
- name: Test installation
83-
run: cmake --install _build --prefix ${GITHUB_WORKSPACE}/_built
84-
85-
Clang-7:
47+
Oldest:
8648
runs-on: ubuntu-20.04
49+
strategy:
50+
matrix:
51+
compiler: [
52+
{ "cpp": "g++", "version": "7", "cmake": ""},
53+
{ "cpp": "clang++", "version": "7", "cmake": "-DCMAKE_CXX_FLAGS=-stdlib=libc++"},
54+
]
8755
env:
88-
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
56+
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON ${{ matrix.compiler.cmake }}
8957
CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
58+
CXX: ${{ matrix.compiler.cpp }}-${{ matrix.compiler.version }}
9059
steps:
91-
- uses: egor-tensin/setup-clang@v1
92-
with:
93-
version: 7
94-
9560
- name: Get pushed code
9661
uses: actions/checkout@v4
9762

0 commit comments

Comments
 (0)