[tor-commits] [tor-browser-build/master] Bug 28310: don't build obfs4 with module versioning support

[gk@xxxxxxxxxxxxxx]

commit 2e468e7b9b13cec82bd8034925433a7fd394a97d
Author: Nicolas Vigier <boklm@xxxxxxxxxxxxxx>
Date:   Mon Nov 5 11:26:06 2018 +0100

    Bug 28310: don't build obfs4 with module versioning support
---
 projects/obfs4/build | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/projects/obfs4/build b/projects/obfs4/build
index 287704a..2c3f933 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -16,6 +16,12 @@ mkdir -p /var/tmp/build
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 cd /var/tmp/build/[% project %]-[% c('version') %]
 
+[% IF c("var/nightly") -%]
+  # Remove go.mod and go.sum files until we can build using Go module
+  # versioning (see bug 28325).
+  rm -f go.mod go.sum
+[% END -%]
+
 mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
 ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
 cd obfs4proxy

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits