Merge pull request #279 from mrueg/build-fixes

go 1.20 / docker image push automation

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
  - master
 
 env:
- GO_VERSION: "~1.19.6"
+ GO_VERSION: "~1.20.2"
 
 jobs:
  # Runs Golangci-lint on the source code
@@ -18,7 +18,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Set up Go 1.x
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
  with:
  go-version: ${{ env.GO_VERSION }}
  id: go
@@ -35,7 +35,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Set up Go 1.x
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
  with:
  go-version: ${{ env.GO_VERSION }}
  id: go
@@ -53,7 +53,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Set up Go 1.x
- uses: actions/setup-go@v3
+ uses: actions/setup-go@v4
  with:
  go-version: ${{ env.GO_VERSION }}
  id: go
@@ -65,7 +65,7 @@ jobs:
  run: |
  make build
 
- # Build Dockerimage
+ # Build and push Dockerimage
  ci-docker-build:
  name: ci-docker-build
  runs-on: ubuntu-latest
@@ -76,8 +76,25 @@ jobs:
  - name: Set up Docker Buildx
  uses: docker/setup-buildx-action@v2
 
- - name: Build and push
+ - name: Build only (on commits)
  uses: docker/build-push-action@v4
+ if: ${{ ! startsWith(github.ref, 'refs/tags/') }}
  with:
  push: false
  tags: kovetskiy/mark:latest
+
+ - name: Login to Docker Hub
+ uses: docker/login-action@v2
+ if: ${{ startsWith(github.ref, 'refs/tags/') }}
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+ - name: Build and push (on tag)
+ uses: docker/build-push-action@v4
+ if: ${{ startsWith(github.ref, 'refs/tags/') }}
+ with:
+ push: true
+ tags: |
+ kovetskiy/mark:${{ steps.extract_tag.outputs.tag }}
+ kovetskiy/mark:latest

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19.6 as builder
+FROM golang:1.20.2 as builder
 ENV GOPATH="/go"
 WORKDIR /go/src/github.com/kovetskiy/mark
 COPY / .

go.mod

@@ -10,7 +10,7 @@ require (
  github.com/reconquest/karma-go v0.0.0-20220904173930-21741aa386a6
  github.com/reconquest/pkg v1.3.0
  github.com/reconquest/regexputil-go v0.0.0-20160905154124-38573e70c1f4
- github.com/stretchr/testify v1.8.1
+ github.com/stretchr/testify v1.8.2
  github.com/yuin/goldmark v1.5.4
  golang.org/x/tools v0.7.0
  gopkg.in/yaml.v3 v3.0.1

go.sum

@@ -37,8 +37,8 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
 github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zazab/zhash v0.0.0-20210630080733-6e809466f8d3 h1:BhVaeQJc3xalHGONn215FylzuxdQBIT3d/aRjDg4nXQ=