mirror of
https://github.com/rclone/rclone.git
synced 2024-11-22 14:39:24 +08:00
Require go1.7 for compilation #2154
* Update the travis tests to exclude go1.6 * Update the compile check to require go1.7+ * Update misc go1.6 workarounds marked in the source
This commit is contained in:
parent
32e02bd367
commit
67023f0040
|
@ -4,11 +4,10 @@ dist: trusty
|
|||
os:
|
||||
- linux
|
||||
go:
|
||||
- 1.6.4
|
||||
- 1.7.6
|
||||
- 1.8.7
|
||||
- 1.9.3
|
||||
- "1.10"
|
||||
- "1.10.1"
|
||||
- tip
|
||||
before_install:
|
||||
- if [[ $TRAVIS_OS_NAME == linux ]]; then sudo modprobe fuse ; sudo chmod 666 /dev/fuse ; sudo chown root:$USER /etc/fuse.conf ; fi
|
||||
|
@ -39,7 +38,7 @@ matrix:
|
|||
- go: tip
|
||||
include:
|
||||
- os: osx
|
||||
go: "1.10"
|
||||
go: "1.10.1"
|
||||
env: GOTAGS=""
|
||||
deploy:
|
||||
provider: script
|
||||
|
@ -47,5 +46,5 @@ deploy:
|
|||
skip_cleanup: true
|
||||
on:
|
||||
all_branches: true
|
||||
go: "1.10"
|
||||
go: "1.10.1"
|
||||
condition: $TRAVIS_OS_NAME == linux && $TRAVIS_PULL_REQUEST == false
|
||||
|
|
|
@ -250,7 +250,7 @@ func cleanAuths(buf []byte) []byte {
|
|||
func (t *Transport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
|
||||
// Get transactions per second token first if limiting
|
||||
if tpsBucket != nil {
|
||||
tbErr := tpsBucket.Wait(context.Background()) // FIXME switch to req.Context() when we drop go1.6 support
|
||||
tbErr := tpsBucket.Wait(req.Context())
|
||||
if tbErr != nil {
|
||||
fs.Errorf(nil, "HTTP token bucket error: %v", err)
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ func TestDurationString(t *testing.T) {
|
|||
in time.Duration
|
||||
want string
|
||||
}{
|
||||
// {time.Duration(0), "0s"}, doesn't work on go1.6
|
||||
{time.Duration(0), "0s"},
|
||||
{time.Second, "1s"},
|
||||
{time.Minute, "1m0s"},
|
||||
{time.Duration(DurationOff), "off"},
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
//+build !go1.6
|
||||
//+build !go1.7
|
||||
|
||||
package fs
|
||||
|
||||
// Upgrade to Go version 1.6 to compile rclone - latest stable go
|
||||
// Upgrade to Go version 1.7 to compile rclone - latest stable go
|
||||
// compiler recommended.
|
||||
func init() { Go_version_1_6_required_for_compilation() }
|
||||
func init() { Go_version_1_7_required_for_compilation() }
|
||||
|
|
Loading…
Reference in New Issue
Block a user