Skip to content

Commit ccc284e

Browse files
committed
build/merge: fix gcloud command error
Also remove hardcoded reviewer emails Change-Id: I0d6b9e7778b1801b3c092ecaae0e8685751a826b Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/225437 Reviewed-by: Rebecca Stambler <[email protected]>
1 parent 3806624 commit ccc284e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

build/merge.bash

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ git merge --no-commit "origin/upstream" || echo "Ignoring conflict..."
2626

2727
COMMIT=`git log --format=%h -n 1 "origin/upstream"`
2828

29-
gcloud builds submit --config=build/cloud.yaml || echo "Build failed. Please address the issue..."
29+
gcloud builds submit --config=build/cloudbuild.yaml || echo "Build failed. Please address the issue..."
3030

3131
git commit -m "sync: merge microsoft/vscode-go@${COMMIT} into master"
3232

33-
git codereview mail -r [email protected],[email protected] HEAD
33+
git codereview mail HEAD
3434
cd - && git worktree remove "${WORKTREE}"

0 commit comments

Comments
 (0)