From f5b3ab8db60e85205f4e24388ca21659bee8cb58 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Sat, 11 May 2019 11:20:00 +0100 Subject: [PATCH] feat: use go 1.12x License: MIT Signed-off-by: Henrique Dias Former-commit-id: 1099ae5d7f6c132cf891e060de7c88f96d656f09 [formerly ea50b2c0686431e5728258fd02ad3a9e907c9349] [formerly 33237bb474abe7524a51501f797ca7cdae44c33f [formerly 30f685a347f9d7ebcf3f099ff7503fb3279a6390]] Former-commit-id: 0669d58fb6dc75a63b6e16857d7a4e09a6ba806f [formerly f4d38b4fbf2a7aa234c1c7cacc743fc386f5fa20] Former-commit-id: 8391f23eaa62ca9a4599c327b8418d9593ad110b --- .travis.yml | 4 +++- wizard.sh | 7 +------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a102e252..74030a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ os: linux services: docker -language: minimal +language: go +go: + - 1.12.x install: skip addons: apt: diff --git a/wizard.sh b/wizard.sh index 137eccd9..55c8c19f 100755 --- a/wizard.sh +++ b/wizard.sh @@ -135,12 +135,7 @@ pushRicebox () { cp ../http/rice-box.go ./ sed -i 's/package http/package caddy/g' ./rice-box.go - docker run --rm -t \ - -v $(pwd):/src \ - -w /src \ - -v /var/run/docker.sock:/var/run/docker.sock \ - filebrowser/dev \ - sh -c "go get -u github.com/filebrowser/filebrowser/v2@latest" + go get -u github.com/filebrowser/filebrowser/v2@latest git checkout -b update-rice-box origin/master git config --local user.name "Filebrowser Bot"