From 0e26dbb331400bc664681aa949af4c0023eb5a47 Mon Sep 17 00:00:00 2001
From: Andrea Pappacoda <andrea@pappacoda.it>
Date: Sun, 21 Aug 2022 22:34:14 +0200
Subject: [PATCH] ci: install scdoc

On Debian, install g++ instead of build-essential, as it drags in
useless dependencies and its description explicitly says that it should
only be installed if you need to build Debian packages.

Also stop using meson's implicit setup command, as it's now discouraged:
https://github.com/mesonbuild/meson/pull/10701
---
 .github/workflows/test.yml | 14 +++++++-------
 .woodpecker.yml            | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 46277af..fff5331 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,7 @@ jobs:
           # the code assumes msvc style printf atm
           export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0
 
-          meson -Dtests=false _build
+          meson setup -Dtests=false _build
           meson compile -C _build
 
   debian-meson:
@@ -49,11 +49,11 @@ jobs:
       - name: Update system and add dependencies
         run: |
           apt-get update
-          apt-get install -y kyua atf-sh build-essential meson
+          apt-get install -y kyua atf-sh g++ meson scdoc
 
       - name: Build
         run: |
-          meson _build -Dwerror=true
+          meson setup _build -Dwerror=true
           meson compile -C _build
 
       - name: Run tests
@@ -71,11 +71,11 @@ jobs:
       - name: Update system and add dependencies
         run: |
           apt-get update
-          apt-get install -y kyua atf-sh build-essential meson
+          apt-get install -y kyua atf-sh g++ meson scdoc
 
       - name: Build
         run: |
-          meson _build -Db_sanitize=address
+          meson setup _build -Db_sanitize=address
           meson compile -C _build
 
       - name: Run tests
@@ -95,7 +95,7 @@ jobs:
       - name: Update system and add dependencies
         run: |
           apt-get update
-          apt-get install -y kyua atf-sh build-essential autoconf libtool
+          apt-get install -y kyua atf-sh g++ autoconf libtool
 
       - name: Build
         run: |
@@ -122,7 +122,7 @@ jobs:
 
       - name: Build
         run: |
-          meson _build -Dwerror=true
+          meson setup _build -Dwerror=true
           meson compile -C _build
 
       - name: Run tests
diff --git a/.woodpecker.yml b/.woodpecker.yml
index 65cd986..22fae2e 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -3,8 +3,8 @@ pipeline:
     image: debian:testing
     commands:
       - apt-get update
-      - apt-get install -y kyua atf-sh build-essential meson
-      - meson _build -Dwerror=true
+      - apt-get install -y kyua atf-sh g++ meson scdoc
+      - meson setup _build -Dwerror=true
       - meson compile -C _build
       - meson test -v -C _build
     when:
@@ -18,8 +18,8 @@ pipeline:
       - ASAN_OPTIONS="exitcode=7"
     commands:
       - apt-get update
-      - apt-get install -y kyua atf-sh build-essential meson
-      - meson _build -Db_sanitize=address
+      - apt-get install -y kyua atf-sh g++ meson scdoc
+      - meson setup _build -Db_sanitize=address
       - meson compile -C _build
       - meson test -v -C _build
     when:
@@ -31,7 +31,7 @@ pipeline:
     image: debian:testing
     commands:
       - apt-get update
-      - apt-get install -y kyua atf-sh build-essential autoconf libtool
+      - apt-get install -y kyua atf-sh g++ autoconf libtool
       - ./autogen.sh
       - ./configure
       - make -j
@@ -45,7 +45,7 @@ pipeline:
     image: alpine
     commands:
       - apk add -U --no-cache kyua atf build-base meson
-      - meson _build -Dwerror=true
+      - meson setup _build -Dwerror=true
       - meson compile -C _build
       - meson test -v -C _build
     when: