From 04e6d8d0e5c93111b7bbc88eabebc7ce6e45ae73 Mon Sep 17 00:00:00 2001
From: Lyuben Penkovski <lyuben.penkovski@vereign.com>
Date: Wed, 1 Nov 2023 09:40:24 +0200
Subject: [PATCH] Update Go version to 1.21.3 and remove CI deployment steps
---
.gitignore | 1 +
.gitlab-ci.yml | 53 +++++------------------------------
deployment/ci/Dockerfile | 2 +-
deployment/compose/Dockerfile | 2 +-
4 files changed, 10 insertions(+), 48 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9f11b75..5c51faa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.idea/
+**/.DS_Store
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d8e1ad..0599c8d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,70 +1,31 @@
-variables:
- HELPERS_FILE: docker-build.yml
- HELM_HELPERS_FILE: helm.yml
- APP_HELM_NAME: signer
- DOCKER_FILE: deployment/ci/Dockerfile
-
stages:
- - compile
- test
- - build
- - helm
- - deploy
-include:
- - project: '${HELPERS_PATH}'
- file: '${HELPERS_FILE}'
- - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
- - project: "$HELM_HELPERS_PATH}"
- file: "${HELM_HELPERS_FILE}"
+before_script:
+ - ln -s /builds /go/src/gitlab.eclipse.org
+ - cd /go/src/gitlab.eclipse.org/${CI_PROJECT_PATH}
-lint:
+linters:
image: golangci/golangci-lint:latest
stage: test
- tags:
- - amd64-docker
script:
+ - go version
- golangci-lint --version
- golangci-lint run
- before_script:
- - ln -s /builds /go/src/gitlab.com
- - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
unit tests:
- image: golang:1.20.3
+ image: golang:1.21.3
stage: test
- tags:
- - amd64-docker
script:
- go version
- go test $(go list ./... | grep -v /integration) -race -coverprofile=coverage.out
- go tool cover -func=coverage.out
- before_script:
- - ln -s /builds /go/src/gitlab.com
- - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
govulncheck:
- image: golang:1.20.3
+ image: golang:1.21.3
stage: test
- tags:
- - amd64-docker
- before_script:
- - ln -s /builds /go/src/gitlab.com
- - cd /go/src/gitlab.com/${CI_PROJECT_PATH}
script:
- go version
- go install golang.org/x/vuln/cmd/govulncheck@latest
- govulncheck ./...
-
-amd64:
- extends: .docker-build
- stage: build
- tags:
- - amd64-docker
-
-helm-lint:
- extends: .helm-lint
- stage: helm
- tags:
- - amd64-docker
diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile
index 95aaa5e..151c3c7 100644
--- a/deployment/ci/Dockerfile
+++ b/deployment/ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3-alpine3.17 as builder
+FROM golang:1.21.3-alpine3.17 as builder
RUN apk add git
diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile
index 1d30b8a..ff9ca4c 100644
--- a/deployment/compose/Dockerfile
+++ b/deployment/compose/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20.3
+FROM golang:1.21.3
RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11
--
GitLab