Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
*.gen.json linguist-generated=true
*_pb2.py linguist-generated=true
go.sum merge=union
vendor/** linguist-vendored
common/** linguist-vendored
2 changes: 1 addition & 1 deletion common/.commonfiles.sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
491344bc0de670df2b0d00520498256e687b4bf4
239096c4f9d521f65ffa88f6999185ea1339f1d8
2 changes: 1 addition & 1 deletion common/scripts/setup_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fi

# Build image to use
if [[ "${IMAGE_VERSION:-}" == "" ]]; then
IMAGE_VERSION=master-e519cfe7cb31dd45c12b9420d81784dc54a87a53
IMAGE_VERSION=master-c8a7e42685e75ec46f4b389b06edf982bf231983
fi
if [[ "${IMAGE_NAME:-}" == "" ]]; then
IMAGE_NAME=build-tools
Expand Down