darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-09 04:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix static assets in development (again)

Browse Source 
Previous attempt: https://github.com/alphagov/notifications-admin/pull/4048

The problem with the previous attempt is that the assets built on
CI become part of the build artefact used for production [1]. This
switches back to my original approach of using environment.sh, but
with a technique to cope with it being absent on CI. I've tested it
works with and without an environment.sh file.

Note that "npm install" is fine to be on a separate line, since a
non-zero exit code will always cause "make" to stop.

[1]: https://github.com/alphagov/notifications-aws/blob/master/concourse/templates/admin.yml.j2#L47
This commit is contained in:
Ben Thorner
2021-10-19 11:05:33 +01:00
parent 61b8e26b9a
commit 1869f9a53a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -25,7 +25,8 @@ VIRTUALENV_ROOT := $(shell [ -z $$VIRTUAL_ENV ] && echo $$(pwd)/venv || echo $$V
.PHONY: bootstrap .PHONY: bootstrap
bootstrap: generate-version-file ## Set up everything to run the app bootstrap: generate-version-file ## Set up everything to run the app
pip3 install -r requirements_for_test.txt pip3 install -r requirements_for_test.txt
npm install && NOTIFY_ENVIRONMENT=development npm run build npm install
. environment.sh; npm run build
.PHONY: run-flask .PHONY: run-flask
run-flask: ## Run flask run-flask: ## Run flask