qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-09-28 18:14:29 -06:00
Code Releases Activity

[dev.boringcrypto] misc/boring: make merge.sh and release.sh a little more robust

Browse Source 
Change-Id: Ie5f48a542889be5d5a15c16b6bd8ce19ee0f5bdd
Reviewed-on: https://go-review.googlesource.com/c/go/+/221277
Reviewed-by: Katie Hockman <katie@golang.org>
This commit is contained in:
Filippo Valsorda 2020-02-26 11:59:05 -05:00
parent 09bc5e8723
commit 601da81916
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/boring/merge.sh
View File

@ -9,7 +9,6 @@ if [ "$#" -ne 2 ]; then
exit 1
fi
set -x
TARGET="$1"
SOURCE="$2"
WORKTREE="$(mktemp -d)"
@ -20,11 +19,12 @@ git worktree add --track -b "$BRANCH" "$WORKTREE" "origin/$TARGET"
cd "$WORKTREE"
export GIT_GOFMT_HOOK=off
git merge -m "all: merge $SOURCE into $TARGET" "$SOURCE" || \
(git rm VERSION && git commit -m "all: merge $SOURCE into $TARGET")
git merge --no-commit "$SOURCE" || echo "Ignoring conflict..."
[[ -f VERSION ]] && git rm -f VERSION
git commit -m "all: merge $SOURCE into $TARGET"
if ! git log --format=%B -n 1 | grep "\[dev.boringcrypto"; then
echo "The commit does not seem to be targeting a BoringCrypto branch."
if ! git log --format=%B -n 1 | grep "\[$TARGET\] "; then
echo "The commit does not seem to be targeting the BoringCrypto branch."
exit 1
fi

4
misc/boring/release.sh
View File

@ -8,7 +8,9 @@ if [ "$#" -eq 0 ]; then
exit 1
fi
set -x
# Check that the Docker daemon is available.
docker ps > /dev/null
WORKTREE="$(mktemp -d)"
BRANCH="boring/release-$(date +%Y%m%d%H%M%S)"