status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

ci: Fix merge conflicts cleanly (#12249)

This commit is contained in:
Chris S. Kim 2022-02-14 23:12:36 -05:00 committed by GitHub
parent 115946da99
commit e7d1ac0ce8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.circleci/config.yml
View File

@ -748,19 +748,14 @@ jobs:
git config --local user.email "github-team-consul-core@hashicorp.com" git config --local user.email "github-team-consul-core@hashicorp.com"
git config --local user.name "hc-github-team-consul-core" git config --local user.name "hc-github-team-consul-core"
# stash newly built bindata_assetfs.go # -B resets the CI branch to main which may diverge history
git stash push # but we will force push anyways.
git checkout -B ci/main-assetfs-build main
# checkout the CI branch and merge latest from main
git checkout ci/main-assetfs-build
git merge --no-edit main
git stash pop
short_sha=$(git rev-parse --short HEAD) short_sha=$(git rev-parse --short HEAD)
git add agent/uiserver/bindata_assetfs.go git add agent/uiserver/bindata_assetfs.go
git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}" git commit -m "auto-updated agent/uiserver/bindata_assetfs.go from commit ${short_sha}"
git push origin ci/main-assetfs-build git push --force origin ci/main-assetfs-build
else else
echo "no UI changes so no static assets to publish" echo "no UI changes so no static assets to publish"
fi fi