From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14C18158094 for ; Tue, 12 Jul 2022 06:33:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44832E1049; Tue, 12 Jul 2022 06:33:31 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1DFEDE1049 for ; Tue, 12 Jul 2022 06:33:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 491F9340FE4 for ; Tue, 12 Jul 2022 06:33:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB226535 for ; Tue, 12 Jul 2022 06:33:28 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1657607600.e41af8d4c5cc22a5dd824e3ffe84000e9aef3480.sam@gentoo> Subject: [gentoo-commits] proj/pax-utils:master commit in: .github/workflows/, / X-VCS-Repository: proj/pax-utils X-VCS-Files: .github/workflows/build-test-ci.yml meson_options.txt X-VCS-Directories: / .github/workflows/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e41af8d4c5cc22a5dd824e3ffe84000e9aef3480 X-VCS-Branch: master Date: Tue, 12 Jul 2022 06:33:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 189dc654-c20d-4188-a286-73c7baec5cc6 X-Archives-Hash: b4a593cf995297f32c4e9397e6dc8b8a commit: e41af8d4c5cc22a5dd824e3ffe84000e9aef3480 Author: Arsen Arsenović aarsen me> AuthorDate: Tue Jun 28 08:38:45 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jul 12 06:33:20 2022 +0000 URL: https://gitweb.gentoo.org/proj/pax-utils.git/commit/?id=e41af8d4 gha: add muon to Linux test matrix Signed-off-by: Arsen Arsenović aarsen.me> Closes: https://github.com/gentoo/pax-utils/pull/7 Signed-off-by: Sam James gentoo.org> .github/workflows/build-test-ci.yml | 38 ++++++++++++++++++++++++++++--------- meson_options.txt | 6 +++--- 2 files changed, 32 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-test-ci.yml b/.github/workflows/build-test-ci.yml index 04d6fc5..e2b7e0e 100644 --- a/.github/workflows/build-test-ci.yml +++ b/.github/workflows/build-test-ci.yml @@ -17,26 +17,46 @@ jobs: matrix: os: [ubuntu-latest] cc: [gcc, clang] + bb: [meson, muon] + fail-fast: false runs-on: ${{ matrix.os }} env: CC: ${{ matrix.cc }} + BB: ${{ matrix.bb }} steps: - name: Install dependencies run: | sudo apt-get update sudo apt-get install -y python3-pyelftools python3-pip \ - libcap-dev libseccomp-dev ninja-build - sudo pip3 install meson + libcap-dev libseccomp-dev ninja-build \ + pkg-config + case "$BB" in + meson) + sudo pip3 install meson + ;; + muon) + wget https://muon.build/releases/muon-amd64-linux-static -O muon + chmod +x muon + sudo install -Dm755 muon /usr/local/bin/muon + ;; + esac - uses: actions/checkout@v2 - run: | - meson -Duse_libcap=enabled \ - -Duse_seccomp=true \ - -Dbuild_manpages=disabled \ - -Dtests=true \ - -Duse_fuzzing=true \ - build + export PKG_CONFIG_PATH="/usr/lib/$(uname -m)-linux-gnu/pkgconfig/" + case "$BB" in + muon) + alias ninja="muon samu" + ;; + esac + + "$BB" setup -Duse_libcap=enabled \ + -Duse_seccomp=true \ + -Dbuild_manpages=disabled \ + -Dtests=true \ + -Duse_fuzzing=true \ + build ninja -C build - ninja -C build test + ( cd build && "$BB" test; ) build-macos: strategy: diff --git a/meson_options.txt b/meson_options.txt index c96865d..04b51fe 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,14 +4,14 @@ option('lddtree_implementation', type : 'combo', option('use_libcap', type : 'feature', value : 'auto', description : 'Enable listing capabilities in pspax output (requires libcap)' ) -option('use_seccomp', type : 'boolean', value : 'true', +option('use_seccomp', type : 'boolean', value : true, description : 'Enable seccomp filters at runtime (does *not* require libseccomp, but does require kernel support)' ) option('build_manpages', type : 'feature', value : 'auto', description : 'Build manuals via DocBook (requires xmlto)') -option('tests', type : 'boolean', value : 'true' +option('tests', type : 'boolean', value : true, description : 'Enable testing (not guaranteed to work)' ) -option('use_fuzzing', type : 'boolean', value : 'true', +option('use_fuzzing', type : 'boolean', value : true, description : 'Also build LibFuzzer fuzzers as tests' )