From 2974558aa7183640446d8d3a078f3c6f202184e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Roth?= Date: Sun, 7 Jun 2026 23:22:49 +0200 Subject: [PATCH] cleanup --- .github/workflows/ci.yml | 4 ++-- CONTRIBUTING.md | 4 ++-- Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e42aa9c..9927bb5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,3 +1,4 @@ +--- name: CI on: @@ -10,7 +11,6 @@ on: defaults: run: - # see: https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#using-a-specific-shell shell: bash --noprofile --norc -eo pipefail {0} env: @@ -33,7 +33,7 @@ jobs: make docker-image - name: "Unit Tests" run: | - make docker-unit-tests + make docker-unit-test mkdir -p out/coverage mv unit.out out/coverage/ - uses: actions/upload-artifact@v4 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d4c32b7f..005f4dab 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,14 +130,14 @@ aptly version: 1.5.0+189+g0fc90dff In order to run aptly unit tests, enter the following: ``` -make docker-unit-tests +make docker-unit-test ``` #### Running system tests In order to run aptly system tests, enter the following: ``` -make docker-system-tests +make docker-system-test ``` #### Running golangci-lint diff --git a/Makefile b/Makefile index 770d9d9d..ec7c12cf 100644 --- a/Makefile +++ b/Makefile @@ -194,7 +194,7 @@ docker-shell: ## Run aptly and other commands in docker container docker-deb: ## Build debian packages in docker container @$(DOCKER_RUN) -t aptly-dev /work/src/system/docker-wrapper dpkg DEBARCH=amd64 -docker-unit-tests: ## Run unit tests in docker container (add TEST=regex to specify which tests to run) +docker-unit-test: ## Run unit tests in docker container (add TEST=regex to specify which tests to run) $(DOCKER_RUN) -t --tmpfs /smallfs:rw,size=1m aptly-dev /work/src/system/docker-wrapper \ azurite-start \ AZURE_STORAGE_ENDPOINT=http://127.0.0.1:10000/devstoreaccount1 \ @@ -241,4 +241,4 @@ clean: ## remove local build and module cache rm -f unit.out aptly.test VERSION docs/docs.go docs/swagger.json docs/swagger.yaml docs/swagger.conf find system/ -type d -name __pycache__ -exec rm -rf {} \; 2>/dev/null || true -.PHONY: help man prepare swagger version binaries build docker-release docker-system-tests docker-unit-test docker-lint docker-build docker-image docker-man docker-shell docker-serve clean releasetype dpkg serve flake8 +.PHONY: help man prepare swagger version binaries build docker-release docker-system-test docker-unit-test docker-lint docker-build docker-image docker-man docker-shell docker-serve clean releasetype dpkg serve flake8