Skip to content

Commit

Permalink
feat: update deps + optimize CI (#119)
Browse files Browse the repository at this point in the history
* feat: update deps

Signed-off-by: Martin Chodur <[email protected]>

* fix: changelog

Signed-off-by: Martin Chodur <[email protected]>

* fix: limit GOMAXPROCS and GOMEMLIMIT for lint in CI

Signed-off-by: Martin Chodur <[email protected]>

* fix: optimise CI

Signed-off-by: Martin Chodur <[email protected]>

* fix: ci

Signed-off-by: Martin Chodur <[email protected]>

* fix: drop make format

Signed-off-by: Martin Chodur <[email protected]>

* fix: ci

Signed-off-by: Martin Chodur <[email protected]>

---------

Signed-off-by: Martin Chodur <[email protected]>
  • Loading branch information
FUSAKLA authored Nov 8, 2024
1 parent 8eab23a commit 9c54b8e
Show file tree
Hide file tree
Showing 5 changed files with 110 additions and 106 deletions.
37 changes: 19 additions & 18 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
version: 2.1
orbs:
go: circleci/[email protected]

defaults: &defaults
docker:
- image: cimg/go:1.23
resource_class: small
executor:
name: go/default # Use the default executor from the orb
tag: "1.23"

version: 2
jobs:
lint:
<<: *defaults
steps:
- checkout
- run: make lint

check_format:
<<: *defaults
steps:
- checkout
- run: |
make format
git diff --color --exit-code
- checkout # checkout source code
- go/load-cache # Load cached Go modules.
- run: GOMAXPROCS=1 GOMEMLIMIT=1750MiB make lint
- go/save-cache # Save Go modules to cache.

test:
<<: *defaults
steps:
- checkout
- checkout # checkout source code
- go/load-cache # Load cached Go modules.
- run: make test-and-coverage
- go/save-cache # Save Go modules to cache.

test-release:
<<: *defaults
Expand All @@ -35,8 +34,10 @@ jobs:
build:
<<: *defaults
steps:
- checkout
- checkout # checkout source code
- go/load-cache # Load cached Go modules.
- run: make build
- go/save-cache # Save Go modules to cache.
- persist_to_workspace:
root: .
paths:
Expand All @@ -54,7 +55,8 @@ jobs:
release:
<<: *defaults
steps:
- checkout
- checkout # checkout source code
- go/load-cache # Load cached Go modules.
- setup_remote_docker
- run: |
echo "${DOCKERHUB_PASSWORD}" | docker login -u="${DOCKERHUB_USER}" --password-stdin
Expand All @@ -65,7 +67,6 @@ workflows:
slo-exporter:
jobs:
- lint
- check_format
- test
- test-release:
filters:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased
### Changed
- [#118](https://github.com/seznam/slo-exporter/pull/118) Upgrade Go to 1.23
- [#119](https://github.com/seznam/slo-exporter/pull/119) Upgrade all deps

## [v6.15.1] 2024-11-06
### Added
Expand Down
7 changes: 1 addition & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ TMP_BIN_DIR ?= $(TMP_DIR)/bin
GORELEASER_VERSION ?= v2.4.4

.PHONY: all
all: format lint test-and-coverage build test-release
all: lint test-and-coverage build test-release

$(TMP_DIR):
mkdir -p $(TMP_DIR)
Expand All @@ -31,11 +31,6 @@ golangci-lint:
@echo "Downloading golangci-lint..."
go install github.com/golangci/golangci-lint/cmd/[email protected]

.PHONY: format
format:
go mod tidy
go fmt ./...

.PHONY: lint
lint: golangci-lint
golangci-lint run --timeout 10m
Expand Down
53 changes: 28 additions & 25 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,70 +3,73 @@ module github.com/seznam/slo-exporter
go 1.23

require (
github.com/envoyproxy/go-control-plane v0.12.0
github.com/envoyproxy/go-control-plane v0.13.1
github.com/go-kit/kit v0.13.0
github.com/go-test/deep v1.0.6
github.com/golang/protobuf v1.5.3
github.com/golang/protobuf v1.5.4
github.com/gorilla/mux v1.8.1
github.com/grafana/loki v1.6.2-0.20211108122114-f61a4d2612d8
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20191002090509-6af20e3a5340
github.com/hashicorp/go-multierror v1.1.1
github.com/hpcloud/tail v1.0.1-0.20180514194441-a1dbeea552b7
github.com/iancoleman/strcase v0.3.0
github.com/prometheus/client_golang v1.18.0
github.com/prometheus/client_model v0.5.0
github.com/prometheus/common v0.46.0
github.com/prometheus/client_golang v1.20.5
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.60.1
github.com/prometheus/prometheus v1.8.2-0.20211011171444-354d8d2ecfac
github.com/segmentio/kafka-go v0.4.47
github.com/sirupsen/logrus v1.9.3
github.com/spf13/viper v1.18.2
github.com/stretchr/testify v1.8.4
github.com/spf13/viper v1.19.0
github.com/stretchr/testify v1.9.0
go.uber.org/atomic v1.11.0
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a
gonum.org/v1/gonum v0.14.0
google.golang.org/grpc v1.60.1
google.golang.org/protobuf v1.32.0
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c
gonum.org/v1/gonum v0.15.1
google.golang.org/grpc v1.68.0
google.golang.org/protobuf v1.35.1
gopkg.in/alecthomas/kingpin.v2 v2.2.6
gopkg.in/yaml.v2 v2.4.0
)

require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 // indirect
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/envoyproxy/protoc-gen-validate v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.17.4 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/pierrec/lz4/v4 v4.1.21 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.20.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
golang.org/x/net v0.30.0 // indirect
golang.org/x/sys v0.27.0 // indirect
golang.org/x/text v0.20.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
Expand Down
Loading

0 comments on commit 9c54b8e

Please sign in to comment.