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
Andrea Pappacoda 2022-08-21 22:34:14 +02:00
parent 92efe9af88
commit 0e26dbb331
Signed by: tachi
GPG Key ID: 4A9208A2455077A7
2 changed files with 13 additions and 13 deletions

View File

@ -35,7 +35,7 @@ jobs:
# the code assumes msvc style printf atm # the code assumes msvc style printf atm
export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0 export CFLAGS=-D__USE_MINGW_ANSI_STDIO=0
meson -Dtests=false _build meson setup -Dtests=false _build
meson compile -C _build meson compile -C _build
debian-meson: debian-meson:
@ -49,11 +49,11 @@ jobs:
- name: Update system and add dependencies - name: Update system and add dependencies
run: | run: |
apt-get update 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 - name: Build
run: | run: |
meson _build -Dwerror=true meson setup _build -Dwerror=true
meson compile -C _build meson compile -C _build
- name: Run tests - name: Run tests
@ -71,11 +71,11 @@ jobs:
- name: Update system and add dependencies - name: Update system and add dependencies
run: | run: |
apt-get update 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 - name: Build
run: | run: |
meson _build -Db_sanitize=address meson setup _build -Db_sanitize=address
meson compile -C _build meson compile -C _build
- name: Run tests - name: Run tests
@ -95,7 +95,7 @@ jobs:
- name: Update system and add dependencies - name: Update system and add dependencies
run: | run: |
apt-get update 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 - name: Build
run: | run: |
@ -122,7 +122,7 @@ jobs:
- name: Build - name: Build
run: | run: |
meson _build -Dwerror=true meson setup _build -Dwerror=true
meson compile -C _build meson compile -C _build
- name: Run tests - name: Run tests

View File

@ -3,8 +3,8 @@ pipeline:
image: debian:testing image: debian:testing
commands: commands:
- apt-get update - apt-get update
- apt-get install -y kyua atf-sh build-essential meson - apt-get install -y kyua atf-sh g++ meson scdoc
- meson _build -Dwerror=true - meson setup _build -Dwerror=true
- meson compile -C _build - meson compile -C _build
- meson test -v -C _build - meson test -v -C _build
when: when:
@ -18,8 +18,8 @@ pipeline:
- ASAN_OPTIONS="exitcode=7" - ASAN_OPTIONS="exitcode=7"
commands: commands:
- apt-get update - apt-get update
- apt-get install -y kyua atf-sh build-essential meson - apt-get install -y kyua atf-sh g++ meson scdoc
- meson _build -Db_sanitize=address - meson setup _build -Db_sanitize=address
- meson compile -C _build - meson compile -C _build
- meson test -v -C _build - meson test -v -C _build
when: when:
@ -31,7 +31,7 @@ pipeline:
image: debian:testing image: debian:testing
commands: commands:
- apt-get update - 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 - ./autogen.sh
- ./configure - ./configure
- make -j - make -j
@ -45,7 +45,7 @@ pipeline:
image: alpine image: alpine
commands: commands:
- apk add -U --no-cache kyua atf build-base meson - apk add -U --no-cache kyua atf build-base meson
- meson _build -Dwerror=true - meson setup _build -Dwerror=true
- meson compile -C _build - meson compile -C _build
- meson test -v -C _build - meson test -v -C _build
when: when: