Push bindata_assetfs.go to a non-protected branch (#12151)

This commit is contained in:
Chris S. Kim 2022-01-21 16:10:54 -05:00 committed by GitHub
parent bee18f4a1d
commit 06fbee2801
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions

View File

@ -689,11 +689,15 @@ jobs:
if ! git diff --quiet --exit-code HEAD^! ui/; then if ! git diff --quiet --exit-code HEAD^! ui/; then
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"
# checkout the CI branch and merge latest from main
git checkout ci/main-assetfs-build
git merge --no-edit main
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 main git push 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