Skip to content

Commit 426f20b

Browse files
committed
release.bash: make work on macOS
macOS's sed always considers the parameter following -i to be an extension, so "-i -e" means "edit in place saving backup with a -e extension". macOS's sed does not support \s in regexps. Change-Id: Ic9b57baa5fc88fff2251c640d11ed417a7257f13 Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/322449 Trust: Damien Neil <[email protected]> Run-TryBot: Damien Neil <[email protected]> Reviewed-by: Joe Tsai <[email protected]>
1 parent febffdd commit 426f20b

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

release.bash

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,14 +63,14 @@ git change release
6363
git sync
6464

6565
# Create commit for actual release.
66-
sed -i -e "s/\(\s*Minor\s*=\s*\)[0-9]*/\1$VERSION_MINOR/" internal/version/version.go
67-
sed -i -e "s/\(\s*Patch\s*=\s*\)[0-9]*/\1$VERSION_PATCH/" internal/version/version.go
68-
sed -i -e "s/\(\s*PreRelease\s*=\s*\)\"[^\"]*\"/\1\"$VERSION_PRERELEASE\"/" internal/version/version.go
66+
sed -i "" -e "s/\(Minor *= *\)[0-9]*/\1$VERSION_MINOR/" internal/version/version.go
67+
sed -i "" -e "s/\(Patch *= *\)[0-9]*/\1$VERSION_PATCH/" internal/version/version.go
68+
sed -i "" -e "s/\(PreRelease *= *\)\"[^\"]*\"/\1\"$VERSION_PRERELEASE\"/" internal/version/version.go
6969
if ! [[ -z $GEN_VERSION ]]; then
70-
sed -i -e "s/\(\s*GenVersion\s*=\s*\)[0-9]*/\1$GEN_VERSION/" runtime/protoimpl/version.go
70+
sed -i "" -e "s/\(GenVersion *= *\)[0-9]*/\1$GEN_VERSION/" runtime/protoimpl/version.go
7171
fi
7272
if ! [[ -z $MIN_VERSION ]]; then
73-
sed -i -e "s/\(\s*MinVersion\s*=\s*\)[0-9]*/\1$MIN_VERSION/" runtime/protoimpl/version.go
73+
sed -i "" -e "s/\(MinVersion *= *\)[0-9]*/\1$MIN_VERSION/" runtime/protoimpl/version.go
7474
fi
7575
git commit -a -m "all: release $(version_string)"
7676

@@ -80,7 +80,7 @@ go test -mod=vendor -timeout=60m -count=1 integration_test.go "$@" -buildRelease
8080
# Create commit to start development after release.
8181
VERSION_PRERELEASE="${VERSION_PRERELEASE}.devel" # append ".devel"
8282
VERSION_PRERELEASE="${VERSION_PRERELEASE#"."}" # trim possible leading "."
83-
sed -i -e "s/\(\s*PreRelease\s*=\s*\)\"[^\"]*\"/\1\"$VERSION_PRERELEASE\"/" internal/version/version.go
83+
sed -i "" -e "s/\(PreRelease *= *\)\"[^\"]*\"/\1\"$VERSION_PRERELEASE\"/" internal/version/version.go
8484
git commit -a -m "all: start $(version_string)"
8585

8686
echo

0 commit comments

Comments
 (0)