Skip to content

Commit 1fddb83

Browse files
committed
Revert "WIP v7 compilers without egor-tensin"
This reverts commit ee0caab.
1 parent 100d270 commit 1fddb83

File tree

1 file changed

+44
-9
lines changed

1 file changed

+44
-9
lines changed

.github/workflows/linux.yaml

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

52-
Oldest:
52+
GCC-7:
53+
runs-on: ubuntu-20.04
54+
env:
55+
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
56+
CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
57+
steps:
58+
- uses: egor-tensin/setup-gcc@v1
59+
with:
60+
version: 7
61+
62+
- name: Get pushed code
63+
uses: actions/checkout@v4
64+
65+
- name: Checkout libebml
66+
uses: actions/checkout@v4
67+
with:
68+
repository: Matroska-Org/libebml
69+
path: libebml
70+
# minimum version we support ref: 'release-1.4.3'
71+
72+
- name: Configure libebml
73+
run: cmake -S libebml -B libebml/_build ${{ env.CMAKE_OPTIONS }}
74+
75+
- name: Build libebml
76+
run: cmake --build libebml/_build --parallel
77+
78+
- name: Install libebml
79+
run: cmake --install libebml/_build --prefix ${GITHUB_WORKSPACE}/_built
80+
81+
- name: Configure
82+
run: cmake -S . -B _build ${{ env.CMAKE_OPTIONS }} ${{ env.CMAKE_MATROSKA_OPTIONS }} -DEBML_DIR="${GITHUB_WORKSPACE}/_built/lib/cmake/EBML"
83+
84+
- name: Build
85+
run: cmake --build _build --parallel
86+
87+
- name: Test installation
88+
run: cmake --install _build --prefix ${GITHUB_WORKSPACE}/_built
89+
90+
Clang-7:
5391
runs-on: ubuntu-20.04
54-
strategy:
55-
matrix:
56-
compiler: [
57-
{ "cpp": "g++", "version": "7", "cmake": ""},
58-
{ "cpp": "clang++", "version": "7", "cmake": "-DCMAKE_CXX_FLAGS=-stdlib=libc++"},
59-
]
6092
env:
61-
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON ${{ matrix.compiler.cmake }}
93+
CMAKE_OPTIONS: -DDEV_MODE=ON -DBUILD_TESTING=ON
6294
CMAKE_MATROSKA_OPTIONS: -DBUILD_EXAMPLES=ON
63-
CXX: ${{ matrix.compiler.cpp }}-${{ matrix.compiler.version }}
6495
steps:
96+
- uses: egor-tensin/setup-clang@v1
97+
with:
98+
version: 7
99+
65100
- name: list compilers
66101
run: dpkg --list | grep compiler
67102
- name: list libc++

0 commit comments

Comments
 (0)