diff --git a/.github/codecov.yml b/.github/codecov.yml index 393229f..fdb7806 100644 --- a/.github/codecov.yml +++ b/.github/codecov.yml @@ -11,4 +11,3 @@ coverage: default: target: 100% threshold: 10% - diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 36bca0c..8e9bfff 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ jobs: ebuild: runs-on: ubuntu-latest container: - image: gentoo/stage3:latest + image: gentoo/stage3:systemd steps: - name: Checkout @@ -52,13 +52,6 @@ jobs: mkdir -p /var/db/repos/gentoo emerge --sync --quiet - if [ ! -L /etc/portage/make.profile ]; then - profile_path="$(find /var/db/repos/gentoo/profiles/default/linux/amd64 -type f -name make.defaults | head -n1)" - if [ -n "${profile_path}" ]; then - ln -snf "$(dirname "${profile_path}")" /etc/portage/make.profile - fi - fi - - name: Configure local overlay run: | mkdir -p /var/db/repos/localrepo/{metadata,profiles,app-misc/lsu} @@ -79,9 +72,22 @@ jobs: mkdir -p /etc/portage/package.accept_keywords printf "=app-misc/lsu-9999 **\n" > /etc/portage/package.accept_keywords/localrepo - - name: Validate ebuild and resolve install plan + - name: Generate manifest run: | FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -mount-sandbox -usersandbox -userpriv" \ ebuild /var/db/repos/localrepo/app-misc/lsu/lsu-9999.ebuild manifest + + - name: Install build dependencies + run: | + FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -mount-sandbox -usersandbox -userpriv" \ + emerge --oneshot dev-vcs/git dev-lang/rust-bin + + - name: Validate dependency resolution + run: | FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -mount-sandbox -usersandbox -userpriv" \ emerge -pv =app-misc/lsu-9999 + + - name: Build ebuild + run: | + FEATURES="-ipc-sandbox -network-sandbox -pid-sandbox -mount-sandbox -usersandbox -userpriv" \ + ebuild /var/db/repos/localrepo/app-misc/lsu/lsu-9999.ebuild fetch unpack compile test diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 0a54f57..dc97ccc 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -55,7 +55,7 @@ jobs: uses: taiki-e/install-action@cargo-llvm-cov - name: Generate lcov coverage - run: cargo llvm-cov --workspace --lcov --output-path lcov.info + run: cargo llvm-cov --all-features --workspace --lcov --output-path lcov.info - name: Upload coverage to Codecov uses: codecov/codecov-action@v5 diff --git a/packaging/archlinux/PKGBUILD b/packaging/archlinux/PKGBUILD index 5c1856b..6d5714c 100644 --- a/packaging/archlinux/PKGBUILD +++ b/packaging/archlinux/PKGBUILD @@ -6,7 +6,7 @@ pkgname=lsu-git pkgver=0.1.2.r0.gcabd0cc pkgrel=1 pkgdesc="Terminal UI for systemd services and latest journal lines" -arch=('x86_64') +arch=('x86_64' 'aarch64' 'armv7h' 'armv6l') url="https://github.com/l5yth/lsu" license=('Apache') options=('!debug') diff --git a/packaging/gentoo/app-misc/lsu/lsu-9999.ebuild b/packaging/gentoo/app-misc/lsu/lsu-9999.ebuild index a885b1b..cd612dc 100644 --- a/packaging/gentoo/app-misc/lsu/lsu-9999.ebuild +++ b/packaging/gentoo/app-misc/lsu/lsu-9999.ebuild @@ -16,13 +16,11 @@ IUSE="" PROPERTIES="live" RDEPEND=" - || ( - sys-apps/systemd - sys-apps/systemd-utils - ) + sys-apps/systemd " BDEPEND=" - dev-lang/rust + dev-vcs/git + || ( dev-lang/rust dev-lang/rust-bin ) " src_unpack() { @@ -31,7 +29,11 @@ src_unpack() { } src_compile() { - cargo_src_compile --bin lsu + cargo_src_compile --locked --bin lsu +} + +src_test() { + cargo_src_test --locked --all-features } src_install() {