Skip to content

Commit

Permalink
fixup! build(py-docker): Merge conflict resolution delete
Browse files Browse the repository at this point in the history
Exposed in GitLab CI:

    Makefile:1680: warning: undefined variable 'TOX_BUILD_PREREQS'
  • Loading branch information
rpatterson committed Feb 9, 2024
1 parent e604c87 commit 75fe023
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ DOCKER_VARIANTS=$(foreach language,$(DOCKER_LANGUAGES),$(DOCKER_OSES:%=%-$(langu
DOCKER_DEFAULT=$(DOCKER_OS_DEFAULT)-$(DOCKER_LANGUAGE_DEFAULT)
endif
export DOCKER_VARIANT?=$(firstword $(DOCKER_VARIANTS))
DOCKER_VARIANT_HOST=$(DOCKER_OS_DEFAULT)-$(PYTHON_HOST_ENV)
DOCKER_DEFAULT_VAR=./var-docker/$(DOCKER_DEFAULT)
DOCKER_OS_DEFAULT_VAR=./var-docker/$(DOCKER_OS_DEFAULT)
export DOCKER_BRANCH_TAG=$(subst /,-,$(VCS_BRANCH))
Expand Down Expand Up @@ -308,6 +309,9 @@ DOCKER_IMAGES+=$(DOCKER_IMAGE_DOCKER)
endif
export DOCKER_PASS?=
DOCKER_COMPOSE_RUN_CMD=docker compose run --rm -T --quiet-pull
ifeq ($(DOCKER_VARIANT),$(DOCKER_VARIANT_HOST))
TOX_BUILD_PREREQS=./var-docker/$(DOCKER_VARIANT_HOST)/log/requirements/build.txt.log
endif
TEST_CODE_PREREQS=./var/log/build-pkgs.log

# Run Python tools in isolated environments managed by Tox:
Expand Down

0 comments on commit 75fe023

Please sign in to comment.