Skip to content

Commit

Permalink
CI: further simplify
Browse files Browse the repository at this point in the history
Remove pointless and redundant Name entries.

Remove auto features. They require a value setting to be absent in
meson_options.txt.

Signed-off-by: Rosen Penev <[email protected]>
  • Loading branch information
neheb committed Jan 8, 2024
1 parent 54f4007 commit deda7e7
Showing 1 changed file with 5 additions and 25 deletions.
30 changes: 5 additions & 25 deletions .github/workflows/meson.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,8 @@ concurrency:

jobs:

Ubuntu-gcc:
Linux-GCC:
runs-on: ubuntu-latest
name: Linux-GCC-deps=${{matrix.deps}}
strategy:
matrix:
deps: ['enabled', 'disabled']
steps:
- uses: actions/checkout@v4
- uses: egor-tensin/setup-gcc@1
Expand All @@ -23,16 +19,12 @@ jobs:
python3 -m pip install meson ninja
- name: Compile and Test
run: |
meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
meson setup "${{github.workspace}}/build" -Dwarning_level=3
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
Ubuntu-clang:
Linux-Clang:
runs-on: ubuntu-latest
name: Linux-Clang-deps=${{matrix.deps}}
strategy:
matrix:
deps: ['enabled', 'disabled']
steps:
- uses: actions/checkout@v4
- uses: egor-tensin/setup-clang@1
Expand All @@ -42,16 +34,12 @@ jobs:
python3 -m pip install meson ninja
- name: Compile and Test
run: |
meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
meson setup "${{github.workspace}}/build" -Dwarning_level=3
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
MacOS:
runs-on: macos-latest
name: macOS-deps=${{matrix.deps}}
strategy:
matrix:
deps: ['enabled', 'disabled']
steps:
- uses: actions/checkout@v4
- name: Install packages
Expand All @@ -60,16 +48,14 @@ jobs:
python3 -m pip install meson ninja
- name: Compile and Test
run: |
meson setup "${{github.workspace}}/build" -Dauto_features=${{matrix.deps}} -Dwarning_level=3
meson setup "${{github.workspace}}/build" -Dwarning_level=3
meson compile -C "${{github.workspace}}/build" --verbose
meson test -C "${{github.workspace}}/build" --verbose
DragonflyBSD:
runs-on: ubuntu-latest
name: DragonflyBSD
steps:
- uses: actions/checkout@v4
- name: DragonflyBSD
uses: vmactions/dragonflybsd-vm@v1
with:
prepare: |
Expand All @@ -81,10 +67,8 @@ jobs:
FreeBSD:
runs-on: ubuntu-latest
name: FreeBSD
steps:
- uses: actions/checkout@v4
- name: FreeBSD
uses: vmactions/freebsd-vm@v1
with:
prepare: |
Expand All @@ -96,10 +80,8 @@ jobs:
NetBSD:
runs-on: ubuntu-latest
name: NetBSD
steps:
- uses: actions/checkout@v4
- name: NetBSD
uses: vmactions/openbsd-vm@v1
with:
prepare: |
Expand All @@ -112,10 +94,8 @@ jobs:
OpenBSD:
runs-on: ubuntu-latest
name: OpenBSD
steps:
- uses: actions/checkout@v4
- name: OpenBSD
uses: vmactions/openbsd-vm@v1
with:
prepare: |
Expand Down

0 comments on commit deda7e7

Please sign in to comment.