diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f902c4e99..6f2483d5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,12 @@ jobs: strategy: fail-fast: false matrix: - job_name: ['linux', 'mac', 'windows_amd64', 'windows_386', 'other_os', 'modules_race', 'go1.10', 'go1.11', 'go1.12'] + job_name: ['linux', 'mac', 'windows_amd64', 'windows_386', 'other_os', 'modules_race', 'go1.11', 'go1.12', 'go1.13'] include: - job_name: linux os: ubuntu-latest - go: '1.13.x' + go: '1.14.x' modules: 'off' gotags: cmount build_flags: '-include "^linux/"' @@ -34,7 +34,7 @@ jobs: - job_name: mac os: macOS-latest - go: '1.13.x' + go: '1.14.x' modules: 'off' gotags: '' # cmount doesn't work on osx travis for some reason build_flags: '-include "^darwin/amd64" -cgo' @@ -44,7 +44,7 @@ jobs: - job_name: windows_amd64 os: windows-latest - go: '1.13.x' + go: '1.14.x' modules: 'off' gotags: cmount build_flags: '-include "^windows/amd64" -cgo' @@ -54,7 +54,7 @@ jobs: - job_name: windows_386 os: windows-latest - go: '1.13.x' + go: '1.14.x' modules: 'off' gotags: cmount goarch: '386' @@ -65,7 +65,7 @@ jobs: - job_name: other_os os: ubuntu-latest - go: '1.13.x' + go: '1.14.x' modules: 'off' build_flags: '-exclude "^(windows/|darwin/amd64|linux/)"' compile_all: true @@ -73,17 +73,11 @@ jobs: - job_name: modules_race os: ubuntu-latest - go: '1.13.x' + go: '1.14.x' modules: 'on' quicktest: true racequicktest: true - - job_name: go1.10 - os: ubuntu-latest - go: '1.10.x' - modules: 'off' - quicktest: true - - job_name: go1.11 os: ubuntu-latest go: '1.11.x' @@ -96,6 +90,12 @@ jobs: modules: 'off' quicktest: true + - job_name: go1.13 + os: ubuntu-latest + go: '1.13.x' + modules: 'off' + quicktest: true + name: ${{ matrix.job_name }} runs-on: ${{ matrix.os }} diff --git a/fs/versioncheck.go b/fs/versioncheck.go index b2f8c7191..8bced1348 100644 --- a/fs/versioncheck.go +++ b/fs/versioncheck.go @@ -1,7 +1,7 @@ -//+build !go1.10 +//+build !go1.11 package fs -// Upgrade to Go version 1.10 to compile rclone - latest stable go +// Upgrade to Go version 1.11 to compile rclone - latest stable go // compiler recommended. -func init() { Go_version_1_10_required_for_compilation() } +func init() { Go_version_1_11_required_for_compilation() } diff --git a/fstest/test_all/clean.go b/fstest/test_all/clean.go index f5ccd7e53..6622f839b 100644 --- a/fstest/test_all/clean.go +++ b/fstest/test_all/clean.go @@ -1,7 +1,5 @@ // Clean the left over test files -// +build go1.11 - package main import ( diff --git a/fstest/test_all/config.go b/fstest/test_all/config.go index 2f365987d..5724072c4 100644 --- a/fstest/test_all/config.go +++ b/fstest/test_all/config.go @@ -1,7 +1,5 @@ // Config handling -// +build go1.11 - package main import ( diff --git a/fstest/test_all/report.go b/fstest/test_all/report.go index 8a4cdc94b..f1d4f5ec4 100644 --- a/fstest/test_all/report.go +++ b/fstest/test_all/report.go @@ -1,5 +1,3 @@ -// +build go1.11 - package main import ( diff --git a/fstest/test_all/run.go b/fstest/test_all/run.go index efe0e6b74..39ffc2d38 100644 --- a/fstest/test_all/run.go +++ b/fstest/test_all/run.go @@ -1,7 +1,5 @@ // Run a test -// +build go1.11 - package main import ( diff --git a/fstest/test_all/run_test.go b/fstest/test_all/run_test.go index 57bbab735..b51ea3313 100644 --- a/fstest/test_all/run_test.go +++ b/fstest/test_all/run_test.go @@ -1,5 +1,3 @@ -// +build go1.11 - package main import ( diff --git a/fstest/test_all/test_all.go b/fstest/test_all/test_all.go index 0d800572b..cb2ee0e18 100644 --- a/fstest/test_all/test_all.go +++ b/fstest/test_all/test_all.go @@ -1,5 +1,3 @@ -// +build go1.11 - // Run tests for all the remotes. Run this with package names which // need integration testing. // diff --git a/lib/encoder/internal/gen/main.go b/lib/encoder/internal/gen/main.go index 30c9e7c21..990e06616 100644 --- a/lib/encoder/internal/gen/main.go +++ b/lib/encoder/internal/gen/main.go @@ -1,5 +1,3 @@ -// +build go1.10 - package main import (