Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated go 1.22.1 #46

Merged
merged 7 commits into from
May 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: 1.19.x
go-version: 1.22.3

- name: Checkout code
uses: actions/checkout@v1

- name: Run Lint
run: make lint
10 changes: 5 additions & 5 deletions .github/workflows/unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@ jobs:
strategy:
matrix:
zk-version: [ 3.6.2 ]
go-version: [ 1.18.x, 1.19.x, 1.20.x ]
go-version: [ 1.22.x ]
runs-on: ubuntu-latest
steps:
- name: Setup Go
uses: actions/setup-go@v1
with:
go-version: ${{ matrix.go-version }}

- name: Setup Java
uses: actions/setup-java@v1
with:
java-version: 14

- name: Checkout code
uses: actions/checkout@v1

- name: Test code
run: make test ZK_VERSION=${{ matrix.zk-version }}

- name: Upload code coverage
uses: codecov/codecov-action@v1
with:
Expand Down
10 changes: 9 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ linters-settings:
- Standard
- Default
- Prefix(github.com/Shopify/zk)
revive:
rules:
- name: empty-block
severity: warning
disabled: true
- name: unused-parameter
severity: warning
disabled: true

linters:
disable-all: true
Expand All @@ -21,7 +29,7 @@ linters:
- staticcheck
- typecheck
- unused

# Extras
- gofmt
- unconvert
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ tools: tools/tools.go tools/go.mod
.PHONY: lint
lint: tools
go vet ./...
$(GOLANGCI_LINT_BIN) run -v --deadline 10m
$(GOLANGCI_LINT_BIN) run -v

.PHONY: lint-fix
lint-fix: tools
go fmt ./...
go vet ./...
$(GOLANGCI_LINT_BIN) run -v --deadline 10m --fix
$(GOLANGCI_LINT_BIN) run -v --fix

.PHONY: build
build:
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
module github.com/Shopify/zk

go 1.18

require golang.org/x/sync v0.0.0-20220907140024-f12130a52804
go 1.22
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
golang.org/x/sync v0.0.0-20220907140024-f12130a52804 h1:0SH2R3f1b1VmIMG7BXbEZCBUu2dKmHschSmjqGUrW8A=
golang.org/x/sync v0.0.0-20220907140024-f12130a52804/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4 changes: 0 additions & 4 deletions server_help_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ const (
_testMyIDFileName = "myid"
)

func init() {
rand.Seed(time.Now().UnixNano())
}

type TestServer struct {
Port int
Path string
Expand Down
Loading
Loading