Skip to content

Commit

Permalink
Merge pull request #202 from WycliffeAssociates/fix-makefile-multilin…
Browse files Browse the repository at this point in the history
…e-command-issue

Fix makefile multiline command issue
  • Loading branch information
linearcombination authored Jun 7, 2024
2 parents 0e10919 + a6dc2ce commit b85eccd
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,35 @@ install-cython: checkvenv
build: checkvenv down clean-mypyc-artifacts install-cython local-install-deps-dev local-install-deps-prod
export IMAGE_TAG=local && \
docker build --progress=plain -t wycliffeassociates/doc:$${IMAGE_TAG} . && \
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend && \
docker build --progress=plain -t wycliffeassociates/doc-ui-tests:$${IMAGE_TAG} -f ./frontend/testsDockerfile ./frontend

.PHONY: build-no-pip-update
build-no-pip-update: checkvenv down clean-mypyc-artifacts
export IMAGE_TAG=local && \
docker build --progress=plain -t wycliffeassociates/doc:$${IMAGE_TAG} . && \
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend && \
docker build --progress=plain -t wycliffeassociates/doc-ui-tests:$${IMAGE_TAG} -f ./frontend/testsDockerfile ./frontend

.PHONY: build-no-pip-update-run-tests
build-no-pip-update-run-tests: checkvenv down clean-mypyc-artifacts
export IMAGE_TAG=local && \
docker build --build-arg RUN_TESTS=true --progress=plain -t wycliffeassociates/doc:$${IMAGE_TAG} . && \
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend
docker build --progress=plain -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend && \
docker build --progress=plain -t wycliffeassociates/doc-ui-tests:$${IMAGE_TAG} -f ./frontend/testsDockerfile ./frontend

.PHONY: build-no-cache
build-no-cache: checkvenv down clean-mypyc-artifacts local-install-deps-prod
export IMAGE_TAG=local && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc:$${IMAGE_TAG} . && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui-tests:$${IMAGE_TAG} -f ./frontend/testsDockerfile ./frontend

.PHONY: build-no-cache-no-pip-update
build-no-cache-no-pip-update: checkvenv down clean-mypyc-artifacts
export IMAGE_TAG=local && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc:$${IMAGE_TAG} . && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui:$${IMAGE_TAG} ./frontend && \
docker build --progress=plain --no-cache --pull -t wycliffeassociates/doc-ui-tests:$${IMAGE_TAG} -f ./frontend/testsDockerfile ./frontend

.PHONY: up
Expand Down Expand Up @@ -225,18 +225,18 @@ local-gunicorn-server: checkvenv

.PHONY: local-update-deps-base
local-update-deps-base: pyupgrade
# pip-compile --resolver=backtracking -v ./backend/requirements.in
pip-compile --upgrade ./backend/requirements.in
pip-compile --resolver=backtracking -v ./backend/requirements.in
# pip-compile --upgrade ./backend/requirements.in

.PHONY: local-update-deps-prod
local-update-deps-prod: local-update-deps-base
# pip-compile --resolver=backtracking -v ./backend/requirements-prod.in
pip-compile --upgrade ./backend/requirements-prod.in
pip-compile --resolver=backtracking -v ./backend/requirements-prod.in
# pip-compile --upgrade ./backend/requirements-prod.in

.PHONY: local-update-deps-dev
local-update-deps-dev: local-update-deps-base
# pip-compile --resolver=backtracking -v ./backend/requirements-dev.in
pip-compile --upgrade ./backend/requirements-dev.in
pip-compile --resolver=backtracking -v ./backend/requirements-dev.in
# pip-compile --upgrade ./backend/requirements-dev.in

.PHONY: local-install-deps-base
local-install-deps-base: install-cython local-update-deps-base
Expand Down

0 comments on commit b85eccd

Please sign in to comment.