Use golang 1.17 (cs3org#2142)

glpatcern · Oct 8, 2021 · 26bc95f · 26bc95f
1 parent a70d374
commit 26bc95f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git 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
@@ -0,0 +1,3 @@
+Enhancement: Use golang v1.17
+
+https://github.com/cs3org/reva/pull/2141
diff --git 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
@@ -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
@@ -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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Enhancement: Use golang v1.17

		https://github.com/cs3org/reva/pull/2141