a
/
code-server-2
mirror of https://git.tuxpa.in/a/code-server.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(update-vscode): use todo items for conflicts in pr body

This commit is contained in:
Joe Previte 2021-03-11 10:50:06 -07:00
parent e79ca99466
commit dac44ec2e0
No known key found for this signature in database
GPG Key ID: 2C91590C6B742C24
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,8 +98,8 @@ main() {
git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true git subtree pull --prefix lib/vscode vscode release/"${VSCODE_VERSION_TO_UPDATE}" --squash || true
# Get the files with conflicts before we commit them # Get the files with conflicts before we commit them
# so we can list them in the PR body # so we can list them in the PR body as todo items
CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- $line"; done) CONFLICTS=$(git diff --name-only --diff-filter=U | while read -r line; do echo "- [ ] $line"; done)
PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS") PR_BODY=$(make_pr_body "$VSCODE_EXACT_VERSION" "$CONFLICTS")
echo -e "\nForcing a commit with conflicts" echo -e "\nForcing a commit with conflicts"