Skip to content
This repository was archived by the owner on Jul 1, 2023. It is now read-only.

Commit 1a01d59

Browse files
committed
Bump go version to 1.15.
Bumping go required bumping golangci-lint due to the following error: level=warning msg="[runner] Can't run linter goanalysis_metalinter: SA1023: failed prerequisites: [email protected]/gravitational/robotest/lib/loc" Which is discussed here: golangci/golangci-lint#827 Bumping golangci-lint in turn required tweaking (or removing) a test that would never run: lib/ssh/ssh_test.go:86:6: func `testEnv` is unused (unused) I chose to enable the test, as ssh_test.go is not run regularly, and I don't fully understand the impact of removing the env parameter from RunAndParse. Better to let someone sort it out when they try to execute ssh_test.go and have more context available.
1 parent 945b614 commit 1a01d59

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export DOCKER_TAG ?=
2424
export DOCKER_ARGS ?= --pull
2525
DOCKERFLAGS := --rm=true $(NOROOT) -v $(PWD):$(SRCDIR) -v $(BUILDDIR):$(SRCDIR)/build -w $(SRCDIR)
2626
BUILDBOX := robotest:buildbox
27-
GOLANGCI_LINT_VER ?= 1.21.0
27+
GOLANGCI_LINT_VER ?= 1.30.0
2828

2929
.PHONY: help
3030
# kudos to https://gist.github.com/prwhite/8168133 for inspiration

docker/build/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
14-
FROM quay.io/gravitational/debian-venti:go1.12.9-stretch
14+
FROM quay.io/gravitational/debian-venti:go1.15-buster
1515

1616
ARG UID
1717
ARG GID

lib/ssh/ssh_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ func TestSshUtils(t *testing.T) {
5050

5151
t.Run("environment", func(t *testing.T) {
5252
t.Parallel()
53-
t.Skip() // this requires setup on sshd side, and we no longer use this method
5453
testEnv(t, client)
5554
})
5655

0 commit comments

Comments
 (0)