From 7512f581f1003c27c007c09ac6e0fb1da4608c22 Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Thu, 27 Feb 2020 21:29:11 -0800
Subject: [PATCH] travis: checkout go.mod/go.sum at the end of travis-setup

---
 .travis.yml | 11 -----------
 Makefile    |  6 +++++-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8f686f3db1..ce1d6c8f7c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,17 +33,6 @@ cache:
   - $HOME/.cache/electron-docker
   - $HOME/.cache/electron-builder-docker
 deploy:
-- provider: releases
-  token:
-    secure: L8xxKXwaUFByM0y/ztlimRsYOURwPY6HusQfeplHVp67y/GCpoSBDPLdk3KmzzQuxafl9u/jiSHUXAvC5h18no89a0AWjQjy63GjGAC1ND9kt2WfS6lwrtUo9ISLr5GasSOb0aMJ7V5oIrslKU1wuDraoGZIdXb0uNIiVVG86g2BDoY5gnYLpdmeqIOHtUIYgbHSfvW++t0PuD4OE/unRhoAXUFGb0Gz9KdQIBRZBvULLCySQ4wZp+LLh8GsRr982Rv4oraa++ddVGFqaDTfZq+hezuCXcmuSsWmTTk7M/J1mU0vuNQw90zAomLxPKZRWXSYBy4Sw1XBJH2Gkav3dKV3T7ZmN+mLmcUdTqnG5R2NC2lYtgQD5usFPjBgchrLUEATdlTOoKneZV3aieXcwTxRGXK9lG+a2VIHo3mAebUnbBmcASdpRwo52V42lsMgTWStTgC4Y7MdrH3zp4FolB/K6S6oKWwBakxYWAxJkMqnrG638EkJdhqGa5/rUVep6powPG4VurkNvuoNsYruj3Wp1Wzk2yj5yNIHfXHISaddeP3qqzF7Y540siyMnf+j3ji2FVrZBmqFl8/kgXd/p47Aum7XqgA7xhEgVm+6BSdheLy7FVuHfpP1G7SIw9yhuC5BSeKZ9BxYU7DHAWa2URQTTAy58NDXzB6ZeIwoFx8=
-  cleanup: false
-  skip_cleanup: true
-  file: "dist/**"
-  draft: true
-  on:
-    repo: kopia/kopia
-    tags: true
-    condition: $TRAVIS_OS_NAME != windows
 - provider: pages
   cleanup: false
   skip_cleanup: true
diff --git a/Makefile b/Makefile
index f05286df32..f8637a131e 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,9 @@ travis-setup: travis-install-gpg-key travis-install-test-credentials all-tools
 	go mod download
 	make -C htmlui node_modules
 	make -C app node_modules
+ifneq ($(TRAVIS_OS_NAME),)
+	-git checkout go.mod go.sum
+endif
 
 website:
 	$(MAKE) -C site build
@@ -75,7 +78,7 @@ ifeq ($(TRAVIS_OS_NAME),linux)
 endif
 
 # goreleaser - builds binaries for all platforms
-GORELEASER_OPTIONS=--rm-dist --skip-publish --parallelism=6
+GORELEASER_OPTIONS=--rm-dist --parallelism=6
 
 sign_gpg=1
 ifneq ($(TRAVIS_PULL_REQUEST),false)
@@ -95,6 +98,7 @@ endif
 ifeq ($(TRAVIS_TAG),)
 	# not a tagged release
 	GORELEASER_OPTIONS+=--snapshot
+	GORELEASER_OPTIONS+=--skip-publish
 endif
 
 goreleaser: $(goreleaser)