Skip to content

Conversation

bufdev
Copy link
Contributor

@bufdev bufdev commented Dec 20, 2017

This does the following:

  • Update the latest version of Protobuf from 3.4.0 to 3.5.0.1
  • Remove some trailing newlines in install-protobuf.sh
  • Add a dummy non-test file for go vet to work in Golang 1.10

@awalterschulze
Copy link
Member

Only new protobuf versions that are available for download with wget are supported. Maybe choose a less minor version?

@bufdev
Copy link
Contributor Author

bufdev commented Dec 20, 2017

Whoops, fixed

@bufdev bufdev changed the title Update to protobuf 3.5.0.1 and minor cleanups for Golang 1.10 Update to protobuf 3.5.0 and minor cleanups for Golang 1.10 Dec 20, 2017
@awalterschulze
Copy link
Member

Seems CHECKDIFF should only be 1 if go is 1.10 (gofmt) and protoc is 3.5.0

@bufdev
Copy link
Contributor Author

bufdev commented Dec 20, 2017

Updated to only run on Golang 1.9

@awalterschulze
Copy link
Member

Ah damn I forgot we don't have the go version in the matrix vars. So now the CHECK_DIFF var does not make sense anymore

I suggest this and removing CHECK_DIFF entirely

if [[ "$PROTOBUF_VERSION" == "3.5.0" ]] && [[ "$TRAVIS_GO_VERSION" == "1.10" ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi

Also please keep echo $TRAVIS_GO_VERSION

And then we need to add go 1.10 to the go versions being tested, since otherwise we are not checking the diff.

Then we also need to add these new versions that we are testing to the Readme.md

@bufdev
Copy link
Contributor Author

bufdev commented Dec 30, 2017

I think this is ready to go.

@bufdev bufdev changed the title Update to protobuf 3.5.0 and minor cleanups for Golang 1.10 Update to protobuf 3.5.1 and minor cleanups for Golang 1.10 Dec 30, 2017
.travis.yml Outdated
- PATH=/home/travis/bin:$PATH make buildserverall
- echo $TRAVIS_GO_VERSION
- if [ "$CHECK_DIFF" == 1 ]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi
- if [[ "$PROTOBUF_VERSION" == "3.5.0" ]] && [[ "$TRAVIS_GO_VERSION" =~ ^1\.9\.[0-9]+$ ]]; then ! git status --porcelain | read || (git status; git diff; exit 1); fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.5.1 ?

@awalterschulze
Copy link
Member

That regex and the fact that I can't see git diff actually running is freaking me out :(

@bufdev
Copy link
Contributor Author

bufdev commented Dec 31, 2017

What do you want to do?

@awalterschulze
Copy link
Member

Ah I see the go: 1.9.x has ruled out the possibility of simply doing an equal. Hmmm

@awalterschulze
Copy link
Member

I have checked previous versions that check diff and the print out is the same. And now that I am back from holiday your regex looks really simple.

@awalterschulze awalterschulze merged commit d4d8b59 into gogo:master Jan 2, 2018
@awalterschulze
Copy link
Member

@peter-edge Thank you for putting up with these really drawn out comments.

@bufdev bufdev deleted the 3.5.0.1 branch January 11, 2018 12:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants