Skip to content

Commit

Permalink
updates Dockerfile and golangci-lint version
Browse files Browse the repository at this point in the history
Signed-off-by: Pranay Valson <[email protected]>
  • Loading branch information
noslav committed Apr 13, 2022
1 parent 780d12f commit d1a92cb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 13 deletions.
28 changes: 16 additions & 12 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@ name: golangci-lint

on:
push:
branches:
- main
branches: [ main ]
pull_request:
branches:
- main

branches: [ main ]
permissions:
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
# pull-requests: read
jobs:
golangci:
name: go-lint
golangci-build:
name: Build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- name: Set up Go 1.17
uses: actions/setup-go@v3
with:
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
version: v1.43
go-version: 1.17.2
id: go
- run: go version

- name: Lint
run: |
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.44.0
./bin/golangci-lint run
# Optional: working directory, useful for monorepos
# working-directory: somedir
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG USER=$USER
# Build Geth in a stock Go builder container
FROM golang:1.18-alpine as builder

RUN apk add --no-cache gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 linux-headers=5.10.41-r0 git=2.34.1-r0
RUN apk add --no-cache gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 linux-headers=5.10.41-r0 git=2.34.2-r0

COPY . /go-ethereum
WORKDIR /go-ethereum
Expand Down

0 comments on commit d1a92cb

Please sign in to comment.