luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

ci: Update CI to stash changes before checkout (#12210)

This commit is contained in:
Chris S. Kim 2022-01-27 10:59:05 -05:00 committed by GitHub
parent 79b9254c1a
commit f7285ed35b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.circleci/config.yml
View File

@ -690,10 +690,15 @@ 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
git stash push
# checkout the CI branch and merge latest from main # checkout the CI branch and merge latest from main
git checkout ci/main-assetfs-build git checkout ci/main-assetfs-build
git merge --no-edit main 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}"