From d208d38f3f94db68c7ec14a3ce3c31f162377a50 Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Wed, 24 Jan 2018 15:03:58 +0100
Subject: [PATCH] Update go, compress executables

---
 .travis.yml | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aefdad24..b10d3106 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,17 +6,19 @@ os:
   - linux
 
 go:
-  - 1.9.2
+  - 1.9.3
 
 script:
   - echo $TRAVIS_GO_VERSION
   - cd dnscrypt-proxy
+  - curl -L https://download.dnscrypt.info/tools/upx-linux > upx
+  - chmod +x upx
 
   - go clean
-  - env GOOS=plan9 go build -ldflags="-s -w"
+  - env GOOS=plan9 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
 
   - go clean
-  - env GOOS=solaris go build -ldflags="-s -w"
+  - env GOOS=solaris go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
 
   - go clean
   - env GOOS=windows GOARCH=386 go build -ldflags="-s -w"
@@ -26,112 +28,112 @@ script:
   - zip -9 -r dnscrypt-proxy-win32-${TRAVIS_TAG:-dev}.zip win32
 
   - go clean
-  - env GOOS=windows GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir win64
   - ln dnscrypt-proxy.exe win64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt win64/
   - zip -9 -r dnscrypt-proxy-win64-${TRAVIS_TAG:-dev}.zip win64
 
   - go clean
-  - env GO386=387 GOOS=openbsd GOARCH=386 go build -ldflags="-s -w"
+  - env GO386=387 GOOS=openbsd GOARCH=386 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir openbsd-i386
   - ln dnscrypt-proxy openbsd-i386/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt openbsd-i386/
   - tar czpvf dnscrypt-proxy-openbsd_i386-${TRAVIS_TAG:-dev}.tar.gz openbsd-i386
 
   - go clean
-  - env GOOS=openbsd GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=openbsd GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir openbsd-amd64
   - ln dnscrypt-proxy openbsd-amd64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt openbsd-amd64/
   - tar czpvf dnscrypt-proxy-openbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz openbsd-amd64
 
   - go clean
-  - env GOOS=freebsd GOARCH=386 go build -ldflags="-s -w"
+  - env GOOS=freebsd GOARCH=386 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir freebsd-i386
   - ln dnscrypt-proxy freebsd-i386/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt freebsd-i386/
   - tar czpvf dnscrypt-proxy-freebsd_i386-${TRAVIS_TAG:-dev}.tar.gz freebsd-i386
 
   - go clean
-  - env GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir freebsd-amd64
   - ln dnscrypt-proxy freebsd-amd64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt freebsd-amd64/
   - tar czpvf dnscrypt-proxy-freebsd_amd64-${TRAVIS_TAG:-dev}.tar.gz freebsd-amd64
 
   - go clean
-  - env GOOS=dragonfly GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=dragonfly GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir dragonflybsd-amd64
   - ln dnscrypt-proxy dragonflybsd-amd64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt dragonflybsd-amd64/
   - tar czpvf dnscrypt-proxy-dragonflybsd_amd64-${TRAVIS_TAG:-dev}.tar.gz dragonflybsd-amd64
 
   - go clean
-  - env GOOS=netbsd GOARCH=386 go build -ldflags="-s -w"
+  - env GOOS=netbsd GOARCH=386 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir netbsd-i386
   - ln dnscrypt-proxy netbsd-i386/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt netbsd-i386/
   - tar czpvf dnscrypt-proxy-netbsd_i386-${TRAVIS_TAG:-dev}.tar.gz netbsd-i386
 
   - go clean
-  - env GOOS=netbsd GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=netbsd GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir netbsd-amd64
   - ln dnscrypt-proxy netbsd-amd64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt netbsd-amd64/
   - tar czpvf dnscrypt-proxy-netbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz netbsd-amd64
 
   - go clean
-  - env GOOS=linux GOARCH=386 go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=386 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-i386
   - ln dnscrypt-proxy linux-i386/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-i386/
   - tar czpvf dnscrypt-proxy-linux_i386-${TRAVIS_TAG:-dev}.tar.gz linux-i386
 
   - go clean
-  - env GOOS=linux GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-x86_64
   - ln dnscrypt-proxy linux-x86_64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-x86_64/
   - tar czpvf dnscrypt-proxy-linux_x86_64-${TRAVIS_TAG:-dev}.tar.gz linux-x86_64
 
   - go clean
-  - env GOOS=linux GOARCH=arm go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=arm go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-arm
   - ln dnscrypt-proxy linux-arm/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-arm/
   - tar czpvf dnscrypt-proxy-linux_arm-${TRAVIS_TAG:-dev}.tar.gz linux-arm
 
   - go clean
-  - env GOOS=linux GOARCH=arm64 go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=arm64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-arm64
   - ln dnscrypt-proxy linux-arm64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-arm64/
   - tar czpvf dnscrypt-proxy-linux_arm64-${TRAVIS_TAG:-dev}.tar.gz linux-arm64
 
   - go clean
-  - env GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-mips
   - ln dnscrypt-proxy linux-mips/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-mips/
   - tar czpvf dnscrypt-proxy-linux_mips-${TRAVIS_TAG:-dev}.tar.gz linux-mips
 
   - go clean
-  - env GOOS=linux GOARCH=mips64 go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=mips64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-mips64
   - ln dnscrypt-proxy linux-mips64/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-mips64/
   - tar czpvf dnscrypt-proxy-linux_mips64-${TRAVIS_TAG:-dev}.tar.gz linux-mips64
 
   - go clean
-  - env GOOS=linux GOARCH=mips64le go build -ldflags="-s -w"
+  - env GOOS=linux GOARCH=mips64le go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir linux-mips64le
   - ln dnscrypt-proxy linux-mips64le/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt linux-mips64le/
   - tar czpvf dnscrypt-proxy-linux_mips64le-${TRAVIS_TAG:-dev}.tar.gz linux-mips64le
 
   - go clean
-  - env GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w"
+  - env GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w" && ./upx --lzma --best dnscrypt-proxy
   - mkdir macos
   - ln dnscrypt-proxy macos/
   - ln ../LICENSE dnscrypt-proxy.toml forwarding-rules.txt blacklist.txt macos/
@@ -150,7 +152,7 @@ deploy:
   skip_cleanup: true
   on:
     repo: jedisct1/dnscrypt-proxy
-    condition: "${TRAVIS_GO_VERSION} == 1.9.2"
+    condition: "${TRAVIS_GO_VERSION} == 1.9.3"
     tags: true
 
 after_deploy: