Skip to content

Commit

Permalink
Merge pull request #37 from celestiaorg/rp/fix-docker-build
Browse files Browse the repository at this point in the history
fix: docker build by bumping Go version
  • Loading branch information
rootulp authored Sep 10, 2024
2 parents 8eaa2a3 + b34d157 commit d91e6c4
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ on:
branches:
- main

env:
GO_VERSION: '1.21.3'

jobs:
docker-build:
name: docker-build
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ name: lint
on:
pull_request:

env:
GO_VERSION: '1.21.3'

jobs:
golangci-lint:
name: golangci-lint
Expand All @@ -14,7 +11,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}
go-version-file: 'go.mod'
- uses: technote-space/[email protected]
with:
# This job will pass without running if go.mod, go.sum, and *.go
Expand All @@ -23,9 +20,9 @@ jobs:
**/**.go
go.mod
go.sum
- uses: golangci/golangci-lint-action@v3.7.0
- uses: golangci/golangci-lint-action@v6.1.0
with:
version: v1.54.2
version: v1.61.0
args: --timeout 10m
github-token: ${{ secrets.github_token }}
if: env.GIT_DIFF
8 changes: 1 addition & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,14 @@ name: test
on:
pull_request:


env:
GO_VERSION: '1.21.3'

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: actions/setup-go@v4
with:
go-version: ${{ env.GO_VERSION }}

go-version-file: 'go.mod'
- name: Run tests
run: make test
timeout-minutes: 5
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM --platform=linux/amd64 docker.io/golang:1.21-alpine3.18 AS builder
FROM --platform=linux/amd64 docker.io/golang:1.22-alpine3.18 AS builder

ENV CGO_ENABLED=0
ENV GO111MODULE=on
Expand Down

0 comments on commit d91e6c4

Please sign in to comment.