Skip to content

Commit

Permalink
Upgraded linter, github actions, dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
bogcon committed May 17, 2024
1 parent 4be7458 commit 95c7dae
Show file tree
Hide file tree
Showing 9 changed files with 99 additions and 89 deletions.
21 changes: 11 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.20.x, 1.21.x]
go-version: [1.21.x, 1.22.x]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}

steps:
- name: Install Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}

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

- name: Load cached dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
Expand All @@ -51,7 +51,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: [1.20.x, 1.21.x]
go-version: [1.21.x, 1.22.x]

services:
redis6:
Expand All @@ -65,7 +65,7 @@ jobs:
- 6379:6379

redis7:
image: redis:7.2.3
image: redis:7.2.4
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
Expand All @@ -76,15 +76,15 @@ jobs:

steps:
- name: Set up ${{ matrix.go-version }}
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go-version }}

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

- name: Load cached dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
Expand All @@ -100,8 +100,9 @@ jobs:
XCACHE_REDIS7_ADDRS: 127.0.0.1:6380

- name: Upload coverage to coveralls.io
if: matrix.go-version == '1.21.x'
uses: shogo82148/actions-goveralls@v1
if: matrix.go-version == '1.22.x'
uses: coverallsapp/github-action@v2
with:
path-to-profile: cover-integration.out
file: cover-integration.out
flag-name: integration-test
fail-on-error: false
2 changes: 1 addition & 1 deletion .golangci-lint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
run:
deadline: 5m
timeout: 5m
tests: true

linters:
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LINTER_VERSION=v1.55.2
LINTER_VERSION=v1.58.1
LINTER=./bin/golangci-lint
ifeq ($(OS),Windows_NT)
LINTER=./bin/golangci-lint.exe
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ or distributed Redis cache, or combination of those two in a multi layered cache
### Installation

```shell
$ go get -u github.com/actforgood/xcache
$ go get github.com/actforgood/xcache
```


Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.benchmark.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.4-alpine3.18
FROM golang:1.22.3-alpine3.19

LABEL maintainer="Bogdan Constantinescu"
LABEL description="Benchmark Runner for XCache"
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.test.local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.4-alpine3.18
FROM golang:1.22.3-alpine3.19

LABEL maintainer="Bogdan Constantinescu"
LABEL description="Test Runner for XCache"
Expand Down
43 changes: 21 additions & 22 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,44 +1,43 @@
module github.com/actforgood/xcache

go 1.20
go 1.21

require (
github.com/actforgood/xconf v1.8.0
github.com/actforgood/xerr v1.3.0
github.com/actforgood/xlog v1.5.0
github.com/actforgood/xconf v1.9.0
github.com/actforgood/xerr v1.4.0
github.com/actforgood/xlog v1.6.0
github.com/coocood/freecache v1.2.4
github.com/go-redis/redis/v8 v8.11.5
github.com/redis/go-redis/v9 v9.3.0
github.com/redis/go-redis/v9 v9.5.1
)

require (
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/fsnotify/fsnotify v1.5.4 // indirect
github.com/getsentry/sentry-go v0.25.0 // indirect
github.com/getsentry/sentry-go v0.27.0 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/onsi/gomega v1.24.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
github.com/spf13/cast v1.6.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.13 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.13 // indirect
go.etcd.io/etcd/client/v3 v3.5.13 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
go.uber.org/zap v1.27.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sys v0.20.0 // indirect
golang.org/x/text v0.15.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.1 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit 95c7dae

Please sign in to comment.