From f12f684eb1911d675d0228ed401d1722bbdd8b5b Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sat, 5 Apr 2025 23:50:47 +0200 Subject: [PATCH] build: remove some old makefile command now handled in the Justfile. --- Makefile | 42 ------------------------------------ dists/docker.sh | 5 ++++- docs/development/tests.md | 2 +- docs/development/workflow.md | 2 +- 4 files changed, 6 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index cef8bd719..2d82a7101 100644 --- a/Makefile +++ b/Makefile @@ -73,11 +73,6 @@ dev: @sudo install -Dm644 ${BUILD}/apparmor.d/${name} /etc/apparmor.d/${name} @sudo systemctl restart apparmor || sudo journalctl -xeu apparmor.service -.PHONY: package -dist ?= archlinux -package: - @bash dists/docker.sh ${dist} - .PHONY: pkg pkg: @makepkg --syncdeps --install --cleanbuild --force --noconfirm @@ -92,43 +87,6 @@ rpm: @bash dists/build.sh rpm @sudo rpm -ivh --force ${PKGDEST}/${PKGNAME}-*.rpm -.PHONY: tests -tests: - @go test ./cmd/... -v -cover -coverprofile=coverage.out - @go test ./pkg/... -v -cover -coverprofile=coverage.out - @go tool cover -func=coverage.out - -.PHONY: lint -lint: - @golangci-lint run - @make --directory=tests lint - @shellcheck --shell=bash \ - PKGBUILD dists/build.sh dists/docker.sh tests/check.sh \ - tests/packer/init.sh tests/packer/src/aa-update tests/packer/clean.sh \ - debian/${PKGNAME}.postinst debian/${PKGNAME}.postrm - .PHONY: check check: @bash tests/check.sh - -.PHONY: integration -integration: - @bats --recursive --timing --print-output-on-failure tests/integration/ - -.PHONY: manual -manual: - @pandoc -t man -s -o root/usr/share/man/man8/aa-log.8 root/usr/share/man/man8/aa-log.md - -.PHONY: docs -docs: - @ENABLED_GIT_REVISION_DATE=false MKDOCS_OFFLINE=true mkdocs build --strict - -.PHONY: serve -serve: - @ENABLED_GIT_REVISION_DATE=false MKDOCS_OFFLINE=false mkdocs serve - -.PHONY: clean -clean: - @rm -rf \ - debian/.debhelper debian/debhelper* debian/*.debhelper debian/${PKGNAME} \ - .pkg/${PKGNAME}* ${BUILD} coverage.out diff --git a/dists/docker.sh b/dists/docker.sh index 1661664a3..2e581883c 100644 --- a/dists/docker.sh +++ b/dists/docker.sh @@ -3,7 +3,10 @@ # Copyright (C) 2022-2024 Alexandre Pujol # SPDX-License-Identifier: GPL-2.0-only -# Usage: make package dist= version= +# Usage: +# just package ubuntu24 +# just package archlinux +# just package opensuse set -eu -o pipefail diff --git a/docs/development/tests.md b/docs/development/tests.md index 652907155..df614b4fe 100644 --- a/docs/development/tests.md +++ b/docs/development/tests.md @@ -19,7 +19,7 @@ Misconfigured AppArmor profiles is one of the most effective ways to break someo - Ensure modern profile naming - Ensure `vim:syntax=apparmor` -- [x] **[Integration Tests:](integration.md)** `make integration` +- [x] **[Integration Tests:](integration.md)** `just integration ` - Run simple CLI commands to ensure no logs are raised. - Uses the [bats](https://github.com/bats-core/bats-core) test system. - Run in the Github Action as well as in all local [test VM](vm.md). diff --git a/docs/development/workflow.md b/docs/development/workflow.md index a1631e3d8..7737e3775 100644 --- a/docs/development/workflow.md +++ b/docs/development/workflow.md @@ -92,7 +92,7 @@ Instead, install an individual profile or the development package, the following For any system with docker installed you can simply build the package with: ```sh - make package dist= + just package ``` Then you can install the package with `dpkg`, `pacman` or `rpm`.