Skip to content

Commit

Permalink
Merge pull request #1007 from lorengordon/feat/install-pip-requiremen…
Browse files Browse the repository at this point in the history
…ts-file
  • Loading branch information
lorengordon authored Jul 2, 2024
2 parents 14f20cb + 36b798b commit dab5e94
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 $*..."
Expand All @@ -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")
Expand Down

0 comments on commit dab5e94

Please sign in to comment.