Skip to content

Commit

Permalink
Merge pull request #130 from okp4/dependabot/docker/golang-1.21-bullseye
Browse files Browse the repository at this point in the history
  • Loading branch information
dependabot[bot] authored Dec 4, 2023
2 parents e5b825b + 4616335 commit 6252852
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.19"
go-version: "1.21"

- name: Build go project
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ jobs:
uses: actions/[email protected]
if: steps.changed-go-files.outputs.any_changed == 'true'
with:
go-version: "1.19"
go-version: "1.21"

- name: Lint go code (golangci-lint)
uses: golangci/golangci-lint-action@v3
if: steps.changed-go-files.outputs.any_changed == 'true'
with:
version: v1.49
version: v1.55

lint-dockerfile:
runs-on: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.19"
go-version: "1.21"

- name: Release project
uses: cycjimmy/semantic-release-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup Go environment
uses: actions/[email protected]
with:
go-version: "1.19"
go-version: "1.21"

- name: Test go project
run: |
Expand Down
6 changes: 1 addition & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ run:
linters:
disable-all: true
enable:
- deadcode
- errcheck
- gosimple
- govet
- ineffassign
- staticcheck
- structcheck
- typecheck
- unused
- varcheck
- asciicheck
- bidichk
- bodyclose
Expand Down Expand Up @@ -91,12 +88,11 @@ issues:
- path: "_test\\.go"
linters:
- bodyclose
- deadcode
- revive
- dupl
- funlen
- goconst
- noctx
- unused
- varcheck
- wrapcheck
- lll
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#--- Build stage
FROM golang:1.20-bullseye AS go-builder
FROM golang:1.21-bullseye AS go-builder

WORKDIR /src

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
BINARY_NAME = template-go
TARGET_FOLDER = target
DIST_FOLDER = $(TARGET_FOLDER)/dist
DOCKER_IMAGE_GOLANG_CI = golangci/golangci-lint:v1.49
DOCKER_IMAGE_GOLANG_CI = golangci/golangci-lint:v1.55

# Some colors
COLOR_GREEN = $(shell tput -Txterm setaf 2)
Expand Down Expand Up @@ -46,7 +46,7 @@ lint-go: ## Lint go source code
-v `pwd`:/app:ro \
-w /app \
${DOCKER_IMAGE_GOLANG_CI} \
golangci-lint run -v
golangci-lint run -v ./...

## Build:
build: build-go ## Build all available artefacts (executable, docker image, etc.)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module okp4/template-go

go 1.19
go 1.21

require (
github.com/smartystreets/goconvey v1.8.1
Expand Down

0 comments on commit 6252852

Please sign in to comment.