diff --git a/update_insider.sh b/update_insider.sh index 1204271..e0868e4 100755 --- a/update_insider.sh +++ b/update_insider.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -ex if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Will not update version JSON because we did not build" @@ -14,14 +14,19 @@ fi echo "$( cat "insider.json" | jq --arg 'tag' "${MS_TAG}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )" > "insider.json" -git config user.email "vscodium-ci@not-real.com" -git config user.name "VSCodium CI" +git status + +git config --global user.email "vscodium-ci@not-real.com" +git config --global user.name "VSCodium CI" git add . CHANGES=$( git status --porcelain ) if [[ ! -z "${CHANGES}" ]]; then git commit -m "build(insider): update to commit ${MS_COMMIT:0:7}" + + git status + if ! git push origin insider --quiet; then git pull origin insider git push origin insider --quiet