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

Merge branch 'main' into 2813-add-quick-filters

Browse Source
This commit is contained in:
Beverly Nguyen
2025-08-07 09:58:08 -07:00
parent 511b0b8b9e 843699061d
commit 28cd113f37
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/checks.yml vendored
View File

@@ -100,9 +100,8 @@ jobs:
# tail -f admin-server.log & # tail -f admin-server.log &
# above make e2e-test # above make e2e-test
run: | run: |
make run-flask > admin-server.log 2>&1 & make run-flask-and-wait > admin-server.log 2>&1 &
tail -f admin-server.log & tail -f admin-server.log &
make e2e-test make e2e-test
@@ -116,7 +115,7 @@ jobs:
NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }} NOTIFY_E2E_AUTH_STATE_PATH: ${{ secrets.NOTIFY_E2E_AUTH_STATE_PATH }}
NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }} NOTIFY_E2E_TEST_EMAIL: ${{ secrets.NOTIFY_E2E_TEST_EMAIL }}
NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }} NOTIFY_E2E_TEST_PASSWORD: ${{ secrets.NOTIFY_E2E_TEST_PASSWORD }}
NOTIFY_E2E_TEST_URI: http://localhost:6012/ NOTIFY_E2E_TEST_URI: http://localhost:6012
VCAP_SERVICES: ${{ secrets.VCAP_SERVICES }} VCAP_SERVICES: ${{ secrets.VCAP_SERVICES }}
validate-new-relic-config: validate-new-relic-config:

7
Makefile
View File

@@ -44,6 +44,13 @@ watch-frontend: ## Build frontend and watch for changes
run-flask: ## Run flask run-flask: ## Run flask
poetry run newrelic-admin run-program flask run -p 6012 --host=0.0.0.0 poetry run newrelic-admin run-program flask run -p 6012 --host=0.0.0.0
.PHONY: run-flask-and-wait
run-flask-and-wait:
@make run-flask &
@echo "Waiting for Flask to start..."
@timeout 30 bash -c 'until curl -sf http://localhost:6012 > /dev/null 2>&1; do sleep 1; done'
@echo "Flask is ready!"
.PHONY: run-flask-bare .PHONY: run-flask-bare
run-flask-bare: ## Run flask without invoking poetry so we can override ENV variables in .env run-flask-bare: ## Run flask without invoking poetry so we can override ENV variables in .env
flask run -p 6012 --host=0.0.0.0 flask run -p 6012 --host=0.0.0.0

2
sample.env
View File

@@ -17,7 +17,7 @@ NODE_EXTRA_CA_CERTS="path to Homebrew CA certificate"
# E2E Testing # E2E Testing
NOTIFY_E2E_TEST_URI=http://localhost:6012/ NOTIFY_E2E_TEST_URI=http://localhost:6012
NOTIFY_E2E_AUTH_STATE_PATH=playwright/.auth/ NOTIFY_E2E_AUTH_STATE_PATH=playwright/.auth/
# Uncomment the next two lines to enable E2E testing; # Uncomment the next two lines to enable E2E testing;