commit bbdb75f2417df66efecf66474bffc047ff557b48 Author: Cecylia Bocovich <cohosh@torproject.org> Date: Mon Mar 9 20:26:33 2020 +0000 Bug 33578: Bump Snowflake version to 58b52eb9f7 This commit bumps the version of Snowflake and includes a fix for removing the go.mod and go.sum files from the repository before building. --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 76546d8..fe74e84 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -16,6 +16,13 @@ cd /var/tmp/build/[% project %]-[% c('version') %] mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports" ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/snowflake.git" +# Remove go.mod and go.sum files until we can build using Go module versioning +rm -f go.mod go.sum + +# Fix gopath location of versioned dependencies +ln -sf "$GOPATH/src/github.com/pion/webrtc" "$GOPATH/src/github.com/pion/webrtc/v2" +ln -sf "$GOPATH/src/github.com/pion/sdp" "$GOPATH/src/github.com/pion/sdp/v2" + cd client go build -ldflags '-s' cp -a client[% IF c("var/windows") %].exe[% END %] $PTDIR/snowflake-client[% IF c("var/windows") %].exe[% END %] diff --git a/projects/snowflake/config b/projects/snowflake/config index d800ee8..bf33032 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: b4f4b29a037fd2444423835da5999f39525f3d24 +git_hash: 58b52eb9f7987789d8e90a982a6df16013e200dd filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var: