Merge branch 'master' into '88-switch-to-marketdata-app-for-stock-market-data'

# Conflicts: # .gitlab-ci.yml
try again
2026-06-03 21:00:26 +00:00 · 2023-04-07 20:44:47 +00:00 · 2023-04-07 14:43:43 -06:00 · 2023-04-07 14:37:13 -06:00 · 2023-04-07 14:33:27 -06:00 · 2023-04-07 14:17:47 -06:00
1 changed files with 3 additions and 1 deletions
@@ -19,7 +19,7 @@ build:master:
    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'


-build:master:
+build:branch:
  stage: build
  image:
    name: gcr.io/kaniko-project/executor:v1.9.0-debug
@@ -30,3 +30,5 @@ build:master:
      --dockerfile "${CI_PROJECT_DIR}/Dockerfile"
      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}"
      --destination "${CI_REGISTRY_IMAGE}:${CI_COMMIT_BRANCH}"
+  rules:
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "master"'
Author	SHA1	Message	Date
Anson	29240b99ac	Merge branch 'master' into '88-switch-to-marketdata-app-for-stock-market-data' # Conflicts: # .gitlab-ci.yml	2023-04-07 20:44:47 +00:00
Anson	4abe4fedcc	try again	2023-04-07 14:43:43 -06:00
Anson	5b12ed1ce4	small CI change	2023-04-07 14:37:13 -06:00
Anson	c6a0320563	round 2	2023-04-07 14:33:27 -06:00
Anson	bca9b3e111	time to fight the CI	2023-04-07 14:17:47 -06:00
Anson	cedacc5749	small code clean up and add linting to repo	2023-04-07 00:15:01 -06:00
Anson	b72f0518c2	get bot working with marketdata api	2023-04-06 23:27:02 -06:00
Anson	bc1ad95c75	apply black formatting to previous commit	2023-04-06 17:15:04 -06:00
Anson	7966871869	original progress from a few weekends ago	2023-04-06 16:17:05 -06:00