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 <[email protected]>
lighttpd · Jan 8, 2024 · d6190f5 · d6190f5
1 parent 115ce47
commit d6190f5
Showing 1 changed file with 9 additions and 29 deletions.
diff --git 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
@@ -22,16 +18,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
@@ -40,16 +32,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
@@ -58,17 +46,15 @@ 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
+      - uses: vmactions/dragonflybsd-vm@v1
         with:
           prepare: |
             pkg install -y ninja meson pkgconf pcre2 perl5
@@ -79,11 +65,9 @@ jobs:
 
   FreeBSD:
     runs-on: ubuntu-latest
-    name: FreeBSD
     steps:
       - uses: actions/checkout@v4
-      - name: FreeBSD
-        uses: vmactions/freebsd-vm@v1
+      - uses: vmactions/freebsd-vm@v1
         with:
           prepare: |
             pkg install -y ninja meson pkgconf pcre2 perl5
@@ -94,11 +78,9 @@ jobs:
 
   NetBSD:
     runs-on: ubuntu-latest
-    name: NetBSD
     steps:
       - uses: actions/checkout@v4
-      - name: NetBSD
-        uses: vmactions/openbsd-vm@v1
+      - uses: vmactions/openbsd-vm@v1
         with:
           prepare: |
             pkg_add ninja meson pkgconf pcre2 perl5
@@ -110,11 +92,9 @@ jobs:
 
   OpenBSD:
     runs-on: ubuntu-latest
-    name: OpenBSD
     steps:
       - uses: actions/checkout@v4
-      - name: OpenBSD
-        uses: vmactions/openbsd-vm@v1
+      - uses: vmactions/openbsd-vm@v1
         with:
           prepare: |
             pkg_add ninja meson pkgconf pcre2 perl5