OCram85/code-server
Archived
1
0
Fork 0
Code Pull Requests 2 Activity

refactor: update script command to get git branch

Browse Source
This commit is contained in:
Joe Previte 2021-03-24 16:35:55 -07:00
parent a1dca6da29
commit 299e17e6d9
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/PULL_REQUEST_TEMPLATE/release_template.md vendored
View File

@ -1,4 +1,5 @@
<!-- Note: this variable $CODE_SERVER_VERSION_TO_UPDATE will be set when you run the release-prep.sh script with `yarn release:prep` --> <!-- Note: this variable $CODE_SERVER_VERSION_TO_UPDATE will be set when you run the release-prep.sh script with `yarn release:prep` -->
This PR is to generate a new release of `code-server` at `$CODE_SERVER_VERSION_TO_UPDATE` This PR is to generate a new release of `code-server` at `$CODE_SERVER_VERSION_TO_UPDATE`
## Screenshot ## Screenshot

20
ci/build/release-prep.sh
View File

@ -5,7 +5,7 @@
# 2. Update the version of code-server (package.json, docs, etc.) # 2. Update the version of code-server (package.json, docs, etc.)
# 3. Update the code coverage badge in the README # 3. Update the code coverage badge in the README
# 4. Open a draft PR using the release_template.md and view in browser # 4. Open a draft PR using the release_template.md and view in browser
# If you want to perform a dry run of this script run DRY_RUN=0 yarn release:prep # If you want to perform a dry run of this script run DRY_RUN=1 yarn release:prep
set -euo pipefail set -euo pipefail
@ -78,10 +78,7 @@ main() {
read -r -p "What version of code-server do you want to update to?"$'\n' CODE_SERVER_VERSION_TO_UPDATE read -r -p "What version of code-server do you want to update to?"$'\n' CODE_SERVER_VERSION_TO_UPDATE
echo -e "Great! We'll prep a PR for updating to $CODE_SERVER_VERSION_TO_UPDATE\n" echo -e "Great! We'll prep a PR for updating to $CODE_SERVER_VERSION_TO_UPDATE\n"
# I can't tell you why but $CMD rg -g '!yarn.lock' -g '!*.svg' --files-with-matches --fixed-strings "${CODE_SERVER_CURRENT_VERSION}" | $CMD xargs sd "$CODE_SERVER_CURRENT_VERSION" "$CODE_SERVER_VERSION_TO_UPDATE"
# when searching with rg, the version needs to in this format: '3\.7\.5'
# that's why we have the parameter expansion with the regex
$CMD rg -g '!yarn.lock' -g '!*.svg' --files-with-matches "${CODE_SERVER_CURRENT_VERSION//\./\\.}" | $CMD xargs sd "$CODE_SERVER_CURRENT_VERSION" "$CODE_SERVER_VERSION_TO_UPDATE"
# Ensure the tests are passing and code coverage is up-to-date # Ensure the tests are passing and code coverage is up-to-date
echo -e "Running unit tests and updating code coverage...\n" echo -e "Running unit tests and updating code coverage...\n"
@ -91,12 +88,19 @@ main() {
# Updates the svg to be green for the badge # Updates the svg to be green for the badge
$CMD sd "red.svg" "green.svg" ../../README.md $CMD sd "red.svg" "green.svg" ../../README.md
$CMD git add . && $CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE" $CMD git commit -am "chore(release): bump version to $CODE_SERVER_VERSION_TO_UPDATE"
CURRENT_BRANCH=$(git branch --show-current)
# Note: we need to set upstream as well or the gh pr create step will fail # Note: we need to set upstream as well or the gh pr create step will fail
# See: https://github.com/cli/cli/issues/575 # See: https://github.com/cli/cli/issues/575
$CMD git push -u origin "$CURRENT_BRANCH" CURRENT_BRANCH=$(git branch | grep '\*' | cut -d' ' -f2-)
if [[ -z $(git config "branch.${CURRENT_BRANCH}.remote") ]]; then
echo "Doesn't look like you've pushed this branch to remote"
echo -e "Pushing now using: git push origin $CURRENT_BRANCH\n"
# Note: we need to set upstream as well or the gh pr create step will fail
# See: https://github.com/cli/cli/issues/575
echo "Please set the upstream and re-run the script"
exit 1
fi
# This runs from the root so that's why we use this path vs. ../../ # This runs from the root so that's why we use this path vs. ../../
RELEASE_TEMPLATE_STRING=$(cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md) RELEASE_TEMPLATE_STRING=$(cat ./.github/PULL_REQUEST_TEMPLATE/release_template.md)

7
ci/dev/update-vscode.sh
View File

@ -81,13 +81,14 @@ main() {
# Push branch to remote if not already pushed # Push branch to remote if not already pushed
# If we don't do this, the opening a draft PR step won't work # If we don't do this, the opening a draft PR step won't work
# because it will stop and ask where you want to push the branch # because it will stop and ask where you want to push the branch
CURRENT_BRANCH=$(git branch --show-current) CURRENT_BRANCH=$(git branch | grep '\*' | cut -d' ' -f2-)
if [[ -z $(git ls-remote --heads origin "$CURRENT_BRANCH") ]]; then if [[ -z $(git config "branch.${CURRENT_BRANCH}.remote") ]]; then
echo "Doesn't look like you've pushed this branch to remote" echo "Doesn't look like you've pushed this branch to remote"
echo -e "Pushing now using: git push origin $CURRENT_BRANCH\n" echo -e "Pushing now using: git push origin $CURRENT_BRANCH\n"
# Note: we need to set upstream as well or the gh pr create step will fail # Note: we need to set upstream as well or the gh pr create step will fail
# See: https://github.com/cli/cli/issues/575 # See: https://github.com/cli/cli/issues/575
git push -u origin "$CURRENT_BRANCH" echo "Please set the upstream and re-run the script"
exit 1
fi fi
echo "Going to try to update vscode for you..." echo "Going to try to update vscode for you..."