Skip to content

Commit

Permalink
#65 - update go version (#80)
Browse files Browse the repository at this point in the history
* #65 - update go version
* update surroundings (gocover, tests & release pipeline)
  • Loading branch information
butuzov authored Feb 7, 2024
1 parent d9bc3ea commit 52a239a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
- "1.19"
- "1.20"
- "1.21"
- "1.22"

steps:

Expand All @@ -42,12 +43,11 @@ jobs:
- run: make tests

- name: Install goveralls
env: { GO111MODULE: "off" }
if: matrix.go == '1.21'
run: go get github.com/mattn/goveralls
if: matrix.go == '1.22'
run: go install github.com/mattn/goveralls@latest

- name: Coverage - Sending Report to Coveral
if: matrix.go == '1.21'
if: matrix.go == '1.22'
env:
COVERALLS_TOKEN: ${{ secrets.github_token }}
run: goveralls -coverprofile=coverage.cov -service=github
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- v*

env:
GO_VERSION: 1.21
GO_VERSION: 1.22
jobs:

GoReeleaser:
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21-alpine as builder
FROM golang:1.22-alpine as builder

WORKDIR /build
RUN apk add --no-cache upx
Expand All @@ -9,7 +9,7 @@ RUN go build -trimpath -o bin/ireturn ./cmd/ireturn
RUN upx --brute /build/bin/ireturn


FROM golang:1.21-alpine as base
FROM golang:1.22-alpine as base
WORKDIR /
COPY --from=builder /build/bin/ireturn ireturn
VOLUME /app
Expand Down
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
export PATH := $(PWD)/bin:$(PATH) # ./bin to $PATH
export SHELL := bash # Default Shell

GOPKGS := $(shell go list ./... | grep -vE "(cmd|testdata)" | tr -s '\n' ',' | sed 's/.\{1\}$$//' )


build:
@ go build -trimpath -o bin/ireturn ./cmd/ireturn/

Expand All @@ -14,7 +11,7 @@ tests:
-parallel=2 \
-timeout=1m \
-covermode=atomic \
-coverpkg=$(GOPKGS) -coverprofile=coverage.cov ./...
-coverprofile=coverage.cov ./...

lints:
golangci-lint run --no-config ./... -D deadcode
Expand Down
3 changes: 3 additions & 0 deletions analyzer/std.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion scripts/generate-std.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p .tmp

tip=21
tip=22

# create std pkg list
for i in $(seq 1 $tip); do
Expand Down

0 comments on commit 52a239a

Please sign in to comment.