From 26bc95fed37312540273439725ebee6ebeef63b1 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Fri, 8 Oct 2021 16:58:21 +0200 Subject: [PATCH] Use golang 1.17 (#2142) --- .drone.star | 34 +++++++++---------- changelog/unreleased/golang-1.17.md | 3 ++ .../fs/owncloudsql/owncloudsql_windows.go | 1 + .../decomposedfs/decomposedfs_windows.go | 1 + pkg/storage/utils/eosfs/eosfs_test.go | 1 + pkg/storage/utils/localfs/localfs_windows.go | 1 + 6 files changed, 24 insertions(+), 17 deletions(-) create mode 100644 changelog/unreleased/golang-1.17.md diff --git a/.drone.star b/.drone.star index ee9036272f..494c282bb0 100644 --- a/.drone.star +++ b/.drone.star @@ -2,7 +2,7 @@ def licenseScanStep(): return { "name": "license-scan", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "environment": { "FOSSA_API_KEY": { "from_secret": "fossa_api_key", @@ -18,7 +18,7 @@ def licenseScanStep(): def makeStep(target): return { "name": "build", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "make %s" % target, ] @@ -133,7 +133,7 @@ def buildAndPublishDocker(): "steps": [ { "name": "store-dev-release", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "environment": { "USERNAME": { "from_secret": "cbox_username", @@ -156,7 +156,7 @@ def buildAndPublishDocker(): lintStep(), { "name": "license-check", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "failure": "ignore", "environment":{ "FOSSA_API_KEY":{ @@ -250,7 +250,7 @@ def changelog(): "steps": [ { "name": "changelog", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "make release-deps && /go/bin/calens > /dev/null", "make check-changelog-drone PR=$DRONE_PULL_REQUEST", @@ -282,7 +282,7 @@ def coverage(): "steps": [ { "name": "unit-test", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "make test", ], @@ -332,7 +332,7 @@ def buildOnly(): lintStep(), { "name": "license-check", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "failure": "ignore", "environment": { "FOSSA_API_KEY": { @@ -367,7 +367,7 @@ def testIntegration(): "steps": [ { "name": "test", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "make test-integration", ], @@ -404,7 +404,7 @@ def release(): lintStep(), { "name": "create-dist", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "go run tools/create-artifacts/main.go -version ${DRONE_TAG} -commit ${DRONE_COMMIT} -goversion `go version | awk '{print $$3}'`", ], @@ -505,7 +505,7 @@ def litmusOcisOldWebdav(): makeStep("build-ci"), { "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "detach": True, "commands": [ "cd /drone/src/tests/oc-integration-tests/drone/", @@ -518,7 +518,7 @@ def litmusOcisOldWebdav(): }, { "name": "sleep-for-revad-start", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands": [ "sleep 5", ], @@ -558,7 +558,7 @@ def litmusOcisNewWebdav(): makeStep("build-ci"), { "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "detach": True, "commands": [ "cd /drone/src/tests/oc-integration-tests/drone/", @@ -571,7 +571,7 @@ def litmusOcisNewWebdav(): }, { "name": "sleep-for-revad-start", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands":[ "sleep 5", ], @@ -612,7 +612,7 @@ def litmusOcisSpacesDav(): makeStep("build-ci"), { "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "detach": True, "commands": [ "cd /drone/src/tests/oc-integration-tests/drone/", @@ -625,7 +625,7 @@ def litmusOcisSpacesDav(): }, { "name": "sleep-for-revad-start", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "commands":[ "sleep 5", ], @@ -677,7 +677,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []): makeStep("build-ci"), { "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "detach": True, "commands": [ "cd /drone/src/tests/oc-integration-tests/drone/", @@ -752,7 +752,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []): makeStep("build-ci"), { "name": "revad-services", - "image": "registry.cern.ch/docker.io/library/golang:1.16", + "image": "registry.cern.ch/docker.io/library/golang:1.17", "detach": True, "commands": [ "cd /drone/src/tests/oc-integration-tests/drone/", diff --git a/changelog/unreleased/golang-1.17.md b/changelog/unreleased/golang-1.17.md new file mode 100644 index 0000000000..6f0ac11779 --- /dev/null +++ b/changelog/unreleased/golang-1.17.md @@ -0,0 +1,3 @@ +Enhancement: Use golang v1.17 + +https://github.com/cs3org/reva/pull/2141 \ No newline at end of file diff --git a/pkg/storage/fs/owncloudsql/owncloudsql_windows.go b/pkg/storage/fs/owncloudsql/owncloudsql_windows.go index 7d2d07b46f..6abd8e1098 100644 --- a/pkg/storage/fs/owncloudsql/owncloudsql_windows.go +++ b/pkg/storage/fs/owncloudsql/owncloudsql_windows.go @@ -16,6 +16,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +//go:build windows // +build windows package owncloudsql diff --git a/pkg/storage/utils/decomposedfs/decomposedfs_windows.go b/pkg/storage/utils/decomposedfs/decomposedfs_windows.go index 4431173404..e4a6c18236 100644 --- a/pkg/storage/utils/decomposedfs/decomposedfs_windows.go +++ b/pkg/storage/utils/decomposedfs/decomposedfs_windows.go @@ -16,6 +16,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +//go:build windows // +build windows package decomposedfs diff --git a/pkg/storage/utils/eosfs/eosfs_test.go b/pkg/storage/utils/eosfs/eosfs_test.go index 72a9ad95ce..6b433aaaf3 100644 --- a/pkg/storage/utils/eosfs/eosfs_test.go +++ b/pkg/storage/utils/eosfs/eosfs_test.go @@ -16,6 +16,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +//go:build eos // +build eos package eosfs diff --git a/pkg/storage/utils/localfs/localfs_windows.go b/pkg/storage/utils/localfs/localfs_windows.go index 7dcab15cc4..1cc33dd6c9 100644 --- a/pkg/storage/utils/localfs/localfs_windows.go +++ b/pkg/storage/utils/localfs/localfs_windows.go @@ -16,6 +16,7 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. +//go:build windows // +build windows package localfs