From ee9ec83413eb356ab24228c11f2258e73601426e Mon Sep 17 00:00:00 2001
From: Andre Sterba <andre.sterba@stud.h-da.de>
Date: Wed, 15 Dec 2021 11:39:36 +0000
Subject: [PATCH] Bump container to Go version 1.17 and restore linter changes
---
.gitlab-ci.yml | 2 +-
.gitlab/ci/.code-quality-ci.yml | 3 +--
.gitlab/ci/.golangci-config/.golangci.yml | 6 +++++-
Dockerfile | 2 +-
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fca153397..8929b266e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@ variables:
GOSDN_IMAGE: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}"
GOSDN_TESTING_IMAGE: "${CI_REGISTRY_IMAGE}:testing_${CI_COMMIT_SHA}"
CEOS_IMAGE: "$CI_REGISTRY_IMAGE/ceos:latest"
- GOLANG_VERSION: "1.16"
+ GOLANG_VERSION: "1.17"
stages:
- build
diff --git a/.gitlab/ci/.code-quality-ci.yml b/.gitlab/ci/.code-quality-ci.yml
index 3910d884c..9a66d4a43 100644
--- a/.gitlab/ci/.code-quality-ci.yml
+++ b/.gitlab/ci/.code-quality-ci.yml
@@ -1,5 +1,5 @@
code-quality:
- image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:latest-alpine
+ image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/golangci/golangci-lint:v1.42-alpine
stage: analyze
script:
# writes golangci-lint output to gl-code-quality-report.json
@@ -10,4 +10,3 @@ code-quality:
paths:
- gl-code-quality-report.json
needs: []
-
\ No newline at end of file
diff --git a/.gitlab/ci/.golangci-config/.golangci.yml b/.gitlab/ci/.golangci-config/.golangci.yml
index 1a2b91837..e9ea64def 100644
--- a/.gitlab/ci/.golangci-config/.golangci.yml
+++ b/.gitlab/ci/.golangci-config/.golangci.yml
@@ -27,9 +27,13 @@ linters:
enable:
- gofmt
- goimports
- - revive
- gocyclo
- govet
+ - unused
+ - staticcheck
+ - typecheck
+ - revive
+ - whitespace
issues:
exclude-use-default: false
max-issues-per-linter: 0
diff --git a/Dockerfile b/Dockerfile
index b583530d4..0e9227f3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GOLANG_VERSION=1.16
+ARG GOLANG_VERSION=1.17
ARG BUILDARGS
ARG $GITLAB_PROXY
--
GitLab