Merge branch 'push_to_github' into 'develop'

Github updated via CI (NOT tag)

See merge request threat-research/security_content!1444
This commit is contained in:
Eric McGinnis
2024-03-20 21:59:31 +00:00
+5 -2
View File
@@ -204,9 +204,12 @@ github_push_develop:
- git remote add github_origin git@github.com:splunk/security_content.git
- git fetch github_origin
- git checkout -b $BRANCH
- git merge github_origin/develop -X theirs
- git config merge.submodule ignore
- git merge github_origin/develop -X theirs || true
- cd contentctl && git checkout main && cd ..
- git add contentctl
- cd contentctl/
- poetry run contentctl -p ../ --enable_enrichment build
- poetry run contentctl -p ../ build --enable_enrichment
- poetry run contentctl -p ../ --enable_enrichment build -t ssa
- poetry run contentctl -p ../ --enable_enrichment build -t api
- cd ..