Merge branch 'main' into avm99963-monorail
Merged commit 4137ed7879acadbf891e8c471108acb874dae886.
GitOrigin-RevId: b6100ffc5b1da355a35f37b13fcaaf746ee8b307
diff --git a/Makefile b/Makefile
index 06e9dc2..57cf679 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,20 @@
_VERSION ?= $(shell ../../../infra/luci/appengine/components/tools/calculate_version.py)
+RUN_CLOUD_TASKS := ../../cipd/cloud-tasks-emulator \
+ --queue projects/monorail-staging/locations/us-central1/queues/componentexport \
+ --queue projects/monorail-staging/locations/us-central1/queues/default \
+ --queue projects/monorail-staging/locations/us-central1/queues/notifications \
+ --queue projects/monorail-staging/locations/us-central1/queues/outboundemail \
+ --queue projects/monorail-staging/locations/us-central1/queues/recomputederivedfields \
+ --queue projects/monorail-staging/locations/us-central1/queues/spamexport \
+ --queue projects/monorail-staging/locations/us-central1/queues/wipeoutsendusers \
+ --queue projects/monorail-staging/locations/us-central1/queues/wipeoutdeleteusers \
+ --queue projects/monorail-staging/locations/us-central1/queues/deleteusers \
+ --queue projects/monorail-staging/locations/us-central1/queues/pubsub-issueupdates \
+ -host localhost \
+ -port 9090
+
default: help
check:
@@ -84,37 +98,29 @@
# to impersonate monorail-staging in the local environment.
serve:
@echo "---[Starting SDK AppEngine Server]---"
- $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS)& $(WEBPACK_PATH) --watch
+ $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS)\
+ & $(WEBPACK_PATH) --watch\
+ & $(RUN_CLOUD_TASKS)
serve_email:
@echo "---[Starting SDK AppEngine Server]---"
- $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS) --enable_sendmail=True& $(WEBPACK_PATH) --watch
+ $(GAE_PY) devserver -A monorail-staging -- $(DEV_APPSERVER_FLAGS) --enable_sendmail=True\
+ & $(WEBPACK_PATH) --watch\
+ & $(RUN_CLOUD_TASKS)
# The _remote commands expose the app on 0.0.0.0, so that it is externally
# accessible by hostname:port, rather than just localhost:port.
serve_remote:
@echo "---[Starting SDK AppEngine Server]---"
- $(GAE_PY) devserver -A monorail-staging -o -- $(DEV_APPSERVER_FLAGS)& $(WEBPACK_PATH) --watch
+ $(GAE_PY) devserver -A monorail-staging -o -- $(DEV_APPSERVER_FLAGS)\
+ & $(WEBPACK_PATH) --watch\
+ & $(RUN_CLOUD_TASKS)
serve_remote_email:
@echo "---[Starting SDK AppEngine Server]---"
- $(GAE_PY) devserver -A monorail-staging -o -- $(DEV_APPSERVER_FLAGS) --enable_sendmail=True& $(WEBPACK_PATH) --watch
-
-serve_cloud_tasks:
- @echo "---[Starting Cloud Tasks Emulator]---"
- ../../cipd/cloud-tasks-emulator \
- --queue projects/monorail-staging/locations/us-central1/queues/componentexport \
- --queue projects/monorail-staging/locations/us-central1/queues/default \
- --queue projects/monorail-staging/locations/us-central1/queues/notifications \
- --queue projects/monorail-staging/locations/us-central1/queues/outboundemail \
- --queue projects/monorail-staging/locations/us-central1/queues/recomputederivedfields \
- --queue projects/monorail-staging/locations/us-central1/queues/spamexport \
- --queue projects/monorail-staging/locations/us-central1/queues/wipeoutsendusers \
- --queue projects/monorail-staging/locations/us-central1/queues/wipeoutdeleteusers \
- --queue projects/monorail-staging/locations/us-central1/queues/deleteusers \
- --queue projects/monorail-staging/locations/us-central1/queues/pubsub-issueupdates \
- -host localhost \
- -port 9090
+ $(GAE_PY) devserver -A monorail-staging -o -- $(DEV_APPSERVER_FLAGS) --enable_sendmail=True\
+ & $(WEBPACK_PATH) --watch\
+ & $(RUN_CLOUD_TASKS)
run: serve
@@ -156,8 +162,6 @@
package_release:
rsync -aLK . $(TARDIR)/package
-
-
lsbuilds:
gcloud builds list --filter="tags='monorail'"