Skip to content

Commit 8bb4036

Browse files
committed
meson CI: get rid of forcefallback
We don't really care about meson subprojects. Since all wraps are available now, we can go back. Signed-off-by: Rosen Penev <[email protected]>
1 parent 4ffbb0b commit 8bb4036

File tree

1 file changed

+11
-6
lines changed

1 file changed

+11
-6
lines changed

.github/workflows/on_PR_meson.yaml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@ jobs:
1313
strategy:
1414
matrix:
1515
cxx: ['9', '13']
16-
deps: ['forcefallback', 'default']
16+
deps: ['enabled', 'disabled']
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: egor-tensin/setup-gcc@v1
2020
with:
2121
version: ${{matrix.cxx}}
2222
- name: Install meson
2323
run: python3 -m pip install meson ninja
24+
- name: Install dependencies
25+
run: sudo apt install -y libcurl4-openssl-dev libbrotli-dev libz-dev gettext
2426
- name: Compile and Test
2527
run: |
26-
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3
27-
meson compile -C "${{github.workspace}}/build"
28-
meson test -C "${{github.workspace}}/build"
28+
meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
29+
meson compile -C "${{github.workspace}}/build" --verbose
30+
meson test -C "${{github.workspace}}/build" --verbose
2931
Ubuntu-clang:
3032
runs-on: ubuntu-22.04
3133
name: Linux-Clang${{matrix.cxx}}-deps=${{matrix.deps}}
3234
strategy:
3335
matrix:
3436
cxx: ['11', '20']
35-
deps: ['forcefallback', 'default']
37+
deps: ['enabled', 'disabled']
3638
steps:
3739
- uses: actions/checkout@v4
3840
- uses: egor-tensin/setup-clang@v1
@@ -41,12 +43,15 @@ jobs:
4143
- name: Install meson
4244
run: |
4345
python3 -m pip install meson ninja
46+
- name: Install dependencies
47+
run: |
48+
sudo apt install -y libcurl4-openssl-dev libbrotli-dev libz-dev gettext
4449
sudo apt install -y libc++abi-${{matrix.cxx}}-dev libc++-${{matrix.cxx}}-dev
4550
- name: Compile and Test
4651
env:
4752
CXXFLAGS: -stdlib=libc++
4853
run: |
49-
meson setup "${{github.workspace}}/build" --wrap-mode=${{matrix.deps}} -Dwarning_level=3
54+
meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
5055
meson compile -C "${{github.workspace}}/build" --verbose
5156
meson test -C "${{github.workspace}}/build" --verbose
5257
VisualStudio:

0 commit comments

Comments
 (0)