commit aabf423be17388db2c980be9f04239479bdb6bb4
Author: Georg Koppen <g...@torproject.org>
Date: Thu Jan 17 10:00:07 2019 +0000
Bug 29105: Unbreak obfs4 nightly builds
---
projects/obfs4/build | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/projects/obfs4/build b/projects/obfs4/build
index 2c3f933..4e42b23 100644
--- a/projects/obfs4/build
+++ b/projects/obfs4/build
@@ -21,9 +21,15 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
# 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"
+# Commit 70d0e90c861be34ce3c5425ef1366a0b2ceb3026 changed the canonical obfs4
+# upstream repo to gitlab.com/yawning/obfs4.git.
+[% IF c("var/nightly") %]
+ mkdir -p "$GOPATH/src/gitlab.com/yawning"
+ ln -sf "$PWD" "$GOPATH/src/gitlab.com/yawning/obfs4.git"
+[% ELSE %]
+ mkdir -p "$GOPATH/src/git.torproject.org/pluggable-transports"
+ ln -sf "$PWD" "$GOPATH/src/git.torproject.org/pluggable-transports/obfs4.git"
+[% END %]
cd obfs4proxy
go build -ldflags '-s'
cp -a obfs4proxy[% IF c("var/windows") %].exe[% END %] $PTDIR
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
