From 4ab0d9ca8a7ed42c21d6c1e4981c8113ed95e052 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 1 Jul 2024 08:18:45 -0700 Subject: [PATCH 1/2] Adds a target for installing pip requirements from a file --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 40814879..5cffbe6f 100644 --- a/Makefile +++ b/Makefile @@ -184,7 +184,13 @@ ec/install: $(@D) --version @ echo "[$@]: Completed successfully!" -install/pip/% install/pip_pkg_with_no_cli/% pytest/install: export PIP ?= $(if $(shell pyenv which $(PYTHON) 2> /dev/null),pip,$(PYTHON) -m pip) +install/pip/% install/pip_pkg_with_no_cli/% install/pip_requirements/% pytest/install: export PIP ?= $(if $(shell pyenv which $(PYTHON) 2> /dev/null),pip,$(PYTHON) -m pip) + +install/pip_requirements/%: + @ echo "[$@]: Installing pip requirements from $*..." + $(PIP) install -r $* + @ echo "[$@]: Completed successfully!" + install/pip/%: export PKG_VERSION_CMD ?= $* --version install/pip/%: | $(BIN_DIR) guard/env/PYPI_PKG_NAME @ echo "[$@]: Installing $*..." @@ -195,6 +201,7 @@ install/pip/%: | $(BIN_DIR) guard/env/PYPI_PKG_NAME install/pip_pkg_with_no_cli/%: | guard/env/PYPI_PKG_NAME @ echo "[$@]: Installing $*..." $(PIP) install $(PYPI_PKG_NAME) + @ echo "[$@]: Completed successfully!" fixuid/install: export FIXUID_VERSION ?= tags/v$(call match_pattern_in_file,$(TARDIGRADE_CI_GITHUB_TOOLS),'boxboat/fixuid','$(SEMVER_PATTERN)') fixuid/install: QUERY = .name | endswith("$(OS)-$(ARCH).tar.gz") From 36b798b2775d259a7324907761004ab387c80bc1 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 1 Jul 2024 15:08:19 -0700 Subject: [PATCH 2/2] Quiets the docker build to reduce log noise --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 78d6e782..8cc57696 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,7 +25,7 @@ jobs: script: make -o docs/lint lint - stage: test name: Run Makefile unit tests - install: docker build --build-arg GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN -t "$IMAGE_NAME" -f Dockerfile . + install: docker build --quiet --build-arg GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN -t "$IMAGE_NAME" -f Dockerfile . script: docker run "$IMAGE_NAME" bats/test - stage: deploy name: Deploy to GitHub Releases