Fix reproducible builds (#4080)

Build with g1.13.3 too.

scripts/gitian-build.sh

@@ -8,15 +8,15 @@
 set -euo pipefail
 
 GITIAN_CACHE_DIRNAME='.gitian-builder-cache'
-GO_DEBIAN_RELEASE='1.12.8-1'
-GO_TARBALL="golang-debian-${GO_DEBIAN_RELEASE}.tar.gz"
-GO_TARBALL_URL="https://salsa.debian.org/go-team/compiler/golang/-/archive/debian/${GO_DEBIAN_RELEASE}/${GO_TARBALL}"
+GO_RELEASE='1.13.3'
+GO_TARBALL="go${GO_RELEASE}.linux-amd64.tar.gz"
+GO_TARBALL_URL="https://dl.google.com/go/${GO_TARBALL}"
 
 # Defaults
 
 DEFAULT_SIGN_COMMAND='gpg --detach-sign'
 DEFAULT_TENDERMINT_SIGS=${TENDERMINT_SIGS:-'tendermint.sigs'}
-DEFAULT_GITIAN_REPO='https://github.com/devrandom/gitian-builder'
+DEFAULT_GITIAN_REPO='https://github.com/tendermint/gitian-builder'
 DEFAULT_GBUILD_FLAGS=''
 DEFAULT_SIGS_REPO='https://github.com/tendermint/tendermint.sigs'
 

scripts/gitian-descriptors/gitian-darwin.yml

@@ -23,23 +23,18 @@ remotes:
 - "url": "https://github.com/tendermint/tendermint.git"
   "dir": "tendermint"
 files:
-- "golang-debian-1.12.8-1.tar.gz"
+- "go1.13.3.linux-amd64.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.8-1
+  GO_SRC_RELEASE=go1.13.3.linux-amd64
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
   export BUILD_DIR=`pwd`
   tar xf "${GO_SRC_TARBALL}"
   rm -f "${GO_SRC_TARBALL}"
-  [ -d "${GO_SRC_RELEASE}/" ]
-  mv "${GO_SRC_RELEASE}/" go/
-  pushd go/
-  QUILT_PATCHES=debian/patches quilt push -a
-  fakeroot debian/rules build RUN_TESTS=false GOCACHE=/tmp/go-cache
-  popd
+  [ -d go/ ]
 
   export GOOS=darwin
   export GOROOT=${BUILD_DIR}/go
@@ -89,6 +84,7 @@ script: |
     # Build tendermint binary
     pushd ${distsrc}
     GOARCH=${arch} GOROOT_FINAL=${GOROOT} go build -a \
+      -trimpath \
       -gcflags=all=-trimpath=${GOPATH} \
       -asmflags=all=-trimpath=${GOPATH} \
       -mod=readonly -tags "tendermint" \

scripts/gitian-descriptors/gitian-linux.yml

@@ -23,23 +23,18 @@ remotes:
 - "url": "https://github.com/tendermint/tendermint.git"
   "dir": "tendermint"
 files:
-- "golang-debian-1.12.8-1.tar.gz"
+- "go1.13.3.linux-amd64.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.8-1
+  GO_SRC_RELEASE=go1.13.3.linux-amd64
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
   export BUILD_DIR=`pwd`
   tar xf "${GO_SRC_TARBALL}"
   rm -f "${GO_SRC_TARBALL}"
-  [ -d "${GO_SRC_RELEASE}/" ]
-  mv "${GO_SRC_RELEASE}/" go/
-  pushd go/
-  QUILT_PATCHES=debian/patches quilt push -a
-  fakeroot debian/rules build RUN_TESTS=false GOCACHE=/tmp/go-cache
-  popd
+  [ -d go/ ]
 
   export GOROOT=${BUILD_DIR}/go
   export GOPATH=${BUILD_DIR}/gopath
@@ -88,6 +83,7 @@ script: |
     # Build tendermint binary
     pushd ${distsrc}
     GOARCH=${arch} GOROOT_FINAL=${GOROOT} go build -a \
+      -trimpath \
       -gcflags=all=-trimpath=${GOPATH} \
       -asmflags=all=-trimpath=${GOPATH} \
       -mod=readonly -tags "tendermint" \

scripts/gitian-descriptors/gitian-windows.yml

@@ -23,23 +23,18 @@ remotes:
 - "url": "https://github.com/tendermint/tendermint.git"
   "dir": "tendermint"
 files:
-- "golang-debian-1.12.8-1.tar.gz"
+- "go1.13.3.linux-amd64.tar.gz"
 script: |
   set -e -o pipefail
 
-  GO_SRC_RELEASE=golang-debian-1.12.8-1
+  GO_SRC_RELEASE=go1.13.3.linux-amd64
   GO_SRC_TARBALL="${GO_SRC_RELEASE}.tar.gz"
   # Compile go and configure the environment
   export TAR_OPTIONS="--mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
   export BUILD_DIR=`pwd`
   tar xf "${GO_SRC_TARBALL}"
   rm -f "${GO_SRC_TARBALL}"
-  [ -d "${GO_SRC_RELEASE}/" ]
-  mv "${GO_SRC_RELEASE}/" go/
-  pushd go/
-  QUILT_PATCHES=debian/patches quilt push -a
-  fakeroot debian/rules build RUN_TESTS=false GOCACHE=/tmp/go-cache
-  popd
+  [ -d go/ ]
 
   export GOOS=windows
   export GOROOT=${BUILD_DIR}/go
@@ -89,6 +84,7 @@ script: |
     # Build tendermint binary
     pushd ${distsrc}
     GOARCH=${arch} GOROOT_FINAL=${GOROOT} go build -a \
+      -trimpath \
       -gcflags=all=-trimpath=${GOPATH} \
       -asmflags=all=-trimpath=${GOPATH} \
       -mod=readonly -tags "tendermint" \