From 9ecff41dd11e920286f9be670a0ec3a668371d1d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:25:28 +0200 Subject: Merging upstream version 1.1~rc0. Signed-off-by: Daniel Baumann --- .github/workflows/meson.yml | 50 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 11 deletions(-) (limited to '.github/workflows/meson.yml') diff --git a/.github/workflows/meson.yml b/.github/workflows/meson.yml index c89de99..9006eae 100644 --- a/.github/workflows/meson.yml +++ b/.github/workflows/meson.yml @@ -14,15 +14,17 @@ jobs: steps: - name: install libraries run: sudo apt-get install libjson-c-dev - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.x' - uses: BSFishy/meson-build@v1.0.3 with: setup-options: --werror options: --verbose action: test # Preserve meson's log file on failure - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 if: failure() with: name: Linux_Meson_Testlog @@ -32,17 +34,41 @@ jobs: runs-on: ubuntu-latest steps: - name: install libraries - run: sudo apt-get remove -y libssl-dev - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + run: sudo apt-get install -y libpam-dev libcap-ng-dev + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.x' - uses: BSFishy/meson-build@v1.0.3 with: - setup-options: --werror + setup-options: --werror --wrap-mode=forcefallback options: --verbose action: test meson-version: 0.61.2 # Preserve meson's log file on failure - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 + if: failure() + with: + name: Linux_Meson_log + path: build/meson-logs/meson-log.txt + + build-static: + runs-on: ubuntu-latest + steps: + - name: install libraries + run: sudo apt-get install -y libpam-dev libcap-ng-dev + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.x' + - uses: BSFishy/meson-build@v1.0.3 + with: + setup-options: --werror --wrap-mode=forcefallback --default-library=static + options: --verbose + action: test + meson-version: 0.61.2 + # Preserve meson's log file on failure + - uses: actions/upload-artifact@v3 if: failure() with: name: Linux_Meson_log @@ -53,8 +79,10 @@ jobs: steps: - name: install libraries run: sudo apt-get install libjson-c-dev lcov - - uses: actions/checkout@v2 - - uses: actions/setup-python@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v4 + with: + python-version: '3.x' - uses: BSFishy/meson-build@v1.0.3 with: setup-options: -Db_coverage=true --werror @@ -64,6 +92,6 @@ jobs: - name: Generate Coverage Report # Can't use meson here, see https://github.com/mesonbuild/meson/issues/7895 run: ninja -C build coverage --verbose - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v3 with: fail_ci_if_error: false -- cgit v1.2.3