diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0599c8dcfa7fd05e8db46ae810af8475b19012e3..643379e7e429dcdac53ae38592eba953013b9b8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ linters: - golangci-lint run unit tests: - image: golang:1.21.3 + image: golang:1.21.4 stage: test script: - go version @@ -23,7 +23,7 @@ unit tests: coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/' govulncheck: - image: golang:1.21.3 + image: golang:1.21.4 stage: test script: - go version diff --git a/.gitlab-ci.yml.old b/.gitlab-ci.yml.old deleted file mode 100644 index 9a68bdb7477ab7da0394827ca3b1ec64e5190b49..0000000000000000000000000000000000000000 --- a/.gitlab-ci.yml.old +++ /dev/null @@ -1,25 +0,0 @@ -stages: - - test - -before_script: - - ln -s /builds /go/src/code.vereign.com - - cd /go/src/code.vereign.com/${CI_PROJECT_PATH} - -lint: - image: golangci/golangci-lint:v1.46.2 - stage: test - tags: - - amd64-docker - script: - - golangci-lint --version - - golangci-lint run - -unit tests: - image: golang:1.17.10 - stage: test - tags: - - amd64-docker - script: - - go version - - go test -race ./... -coverprofile=coverage.out - - go tool cover -func=coverage.out diff --git a/deployment/ci/Dockerfile b/deployment/ci/Dockerfile index 45e75169d87f33dc61e2c7ad0f69de4f633a3eb2..6e562cf2eb25ed1ffc3066b03b2be6f9bc357ac8 100644 --- a/deployment/ci/Dockerfile +++ b/deployment/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3-alpine3.17 as builder +FROM golang:1.21.4-alpine3.17 as builder RUN apk add git diff --git a/deployment/compose/Dockerfile b/deployment/compose/Dockerfile index ff9ca4c9df44bb8233f02846e58990a2b0c4a16d..751616b3003b12835a0e05b4575ac8ddcd8de314 100644 --- a/deployment/compose/Dockerfile +++ b/deployment/compose/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.21.3 +FROM golang:1.21.4 RUN go install github.com/ysmood/kit/cmd/guard@v0.25.11