From deda7e765b5feded93285f921007aed85c7a1243 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 7 Jan 2024 21:15:08 -0800 Subject: [PATCH] CI: further simplify 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 --- .github/workflows/meson.yml | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index 91a9f3f0c..a42391559 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -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 @@ -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 @@ -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 @@ -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: | @@ -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: | @@ -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: | @@ -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: |