diff --git a/insider.json b/insider.json index 599e685..82cd827 100644 --- a/insider.json +++ b/insider.json @@ -1,4 +1,4 @@ { - "tag": "1.71.0-insider", + "tag": "1.71.0", "commit": "16faaf4eb07424d5d7dba7d12bffd64309c283f7" } diff --git a/update_insider.sh b/update_insider.sh index e0868e4..18191ba 100755 --- a/update_insider.sh +++ b/update_insider.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -ex +set -e if [[ "${SHOULD_BUILD}" != "yes" ]]; then echo "Will not update version JSON because we did not build" @@ -12,9 +12,7 @@ if [[ -z "${GITHUB_TOKEN}" ]]; then exit fi -echo "$( cat "insider.json" | jq --arg 'tag' "${MS_TAG}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )" > "insider.json" - -git status +echo "$( cat "insider.json" | jq --arg 'tag' "${MS_TAG/\-insider/}" --arg 'commit' "${MS_COMMIT}" '. | .tag=$tag | .commit=$commit' )" > "insider.json" git config --global user.email "vscodium-ci@not-real.com" git config --global user.name "VSCodium CI" @@ -25,8 +23,6 @@ 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