Skip to content

Commit aae4509

Browse files
committed
fixup! [R] Add BigQuery table import to Makefile and rename post_deploy script
1 parent 731680c commit aae4509

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

.gitlab-ci.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,16 @@ deploy:
9797
paths:
9898
- terraform/plan.json
9999

100+
import:
101+
extends: .base_on_push
102+
stage: deploy
103+
timeout: 5m # probably needs to be extended
104+
needs:
105+
- build_image
106+
- deploy
107+
script:
108+
- make import
109+
100110
deploy_browser:
101111
extends: .base_on_push
102112
stage: deploy

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,16 @@ $(1)terraform: lambdas
102102

103103
.PHONY: $(1)deploy
104104
$(1)deploy: check_python $(1)terraform
105-
python $(project_root)/scripts/reindex.py --import --sources "tdr:${GOOGLE_PROJECT}:snapshot/*"
106-
python $(project_root)/scripts/verify_tdr_sources.py
107105
endef
108106

109107
$(eval $(call deploy,))
110108
$(eval $(call deploy,auto_))
111109

110+
.PHONY: import
111+
import: check_python
112+
python $(project_root)/scripts/reindex.py --import --sources "tdr:${GOOGLE_PROJECT}:snapshot/*"
113+
python $(project_root)/scripts/verify_tdr_sources.py
114+
112115
.PHONY: destroy
113116
destroy:
114117
$(MAKE) -C terraform destroy

0 commit comments

Comments
 (0)