grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

buildscripts: Fix check for java-example-hostname:latest tagging 

The previous 'git ls-remote' was returning the tag-referenced commits via
vF.O.O^{} which was confusing the version check (as v1.30.0 would not match
v1.30.0^{}). Passing --refs filters those ^{} tags.

There was also a missing 'v' in the version check. It was added explicitly to
generate the list but not to check the result.
This commit is contained in:
Eric Anderson 2020-07-23 12:41:45 -07:00 committed by Eric Anderson
parent 61fd6d3ecd
commit 8a792c3367
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildscripts/kokoro/upload_artifacts.sh
View File

@ -73,7 +73,7 @@ fi
VERSION="$(cat $LOCAL_OTHER_ARTIFACTS/version)" VERSION="$(cat $LOCAL_OTHER_ARTIFACTS/version)"
EXAMPLE_HOSTNAME_ID="$(cat "$LOCAL_OTHER_ARTIFACTS/example-hostname.id")" EXAMPLE_HOSTNAME_ID="$(cat "$LOCAL_OTHER_ARTIFACTS/example-hostname.id")"
docker load --input "$LOCAL_OTHER_ARTIFACTS/example-hostname.tar" docker load --input "$LOCAL_OTHER_ARTIFACTS/example-hostname.tar"
LATEST_VERSION="$((echo "v$VERSION"; git ls-remote -t https://github.com/grpc/grpc-java.git | cut -f 2 | sed s#refs/tags/##) | sort -V | tail -n 1)" LATEST_VERSION="$((echo "v$VERSION"; git ls-remote -t --refs https://github.com/grpc/grpc-java.git | cut -f 2 | sed s#refs/tags/##) | sort -V | tail -n 1)"
STAGING_REPO=a93898609ef848 STAGING_REPO=a93898609ef848
@ -81,7 +81,7 @@ STAGING_REPO=a93898609ef848
docker tag "$EXAMPLE_HOSTNAME_ID" "grpc/java-example-hostname:${VERSION}" docker tag "$EXAMPLE_HOSTNAME_ID" "grpc/java-example-hostname:${VERSION}"
docker push "grpc/java-example-hostname:${VERSION}" docker push "grpc/java-example-hostname:${VERSION}"
if [[ "$VERSION" = "$LATEST_VERSION" ]]; then if [[ "v$VERSION" = "$LATEST_VERSION" ]]; then
docker tag "$EXAMPLE_HOSTNAME_ID" grpc/java-example-hostname:latest docker tag "$EXAMPLE_HOSTNAME_ID" grpc/java-example-hostname:latest
docker push grpc/java-example-hostname:latest docker push grpc/java-example-hostname:latest
fi fi