Skip to content

Commit

Permalink
bump go to 1.21.3, update flake.lock (#59)
Browse files Browse the repository at this point in the history
* bump go to 1.21.3, update flake.lock

* remove vendor, update CI

* update GOROOT

* temp disable bench, move lint/test/e2e to nix
  • Loading branch information
skudasov committed Feb 8, 2024
1 parent 0a65889 commit c029831
Show file tree
Hide file tree
Showing 6,811 changed files with 75 additions and 2,069,674 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .github/workflows/bench.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Bench
on: [push]
on: [workflow_call]
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@ jobs:
name: lint
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: '1.20'
cache: true
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
- uses: cachix/install-nix-action@v18
with:
version: v1.51.2
nix_path: nixpkgs=channel:nixos-unstable
- name: Run lint
run: |-
nix develop -c make lint
13 changes: 5 additions & 8 deletions .github/workflows/test-external-load-gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,9 @@ jobs:
runs-on: ubuntu20.04-8cores-32GB
steps:
- uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
- uses: cachix/install-nix-action@v18
with:
go-version-file: "go.mod"
cache: true
- name: Download Go vendor packages
run: go mod download
- name: Run external load test
run: make test_loki
nix_path: nixpkgs=channel:nixos-unstable
- name: Run tests
run: |-
nix develop -c make test_loki
11 changes: 4 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ jobs:
runs-on: ubuntu20.04-8cores-32GB
steps:
- uses: actions/checkout@v3
- name: Setup Go
uses: actions/setup-go@v3
- uses: cachix/install-nix-action@v18
with:
go-version-file: "go.mod"
cache: true
- name: Download Go vendor packages
run: go mod download
nix_path: nixpkgs=channel:nixos-unstable
- name: Run tests
run: make test_race
run: |-
nix develop -c make test_race
2 changes: 1 addition & 1 deletion CLUSTER.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cd charts/wasp
kubectl create ns wasp
kubectl -n wasp apply -f setup.yaml
```
- Build your `Docker` container with tests, you can use this [example](Dockerfile.test)
- Build your `Docker` container with tests, you can use this [example](Dockerfile)
```
docker build -f Dockerfile.test --build-arg BUILD_ROOT=/go/src/examples/cluster -t wasp_test .
docker tag wasp_test:latest ${registry}/wasp_test:latest
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions flake.lock

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

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

outputs = inputs@{ self, nixpkgs, flake-utils, ... }:
flake-utils.lib.eachDefaultSystem (system:
let pkgs = import nixpkgs { inherit system; overlays = [ ]; };
let pkgs = import nixpkgs { inherit system; overlays = []; };
in rec {
devShell = pkgs.callPackage ./shell.nix {};
});
Expand Down
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/smartcontractkit/wasp
go 1.21

require (
github.com/K-Phoen/grabana v0.21.17
github.com/K-Phoen/grabana v0.22.1
github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8
github.com/gin-gonic/gin v1.8.1
github.com/go-resty/resty/v2 v2.7.0
Expand All @@ -13,7 +13,7 @@ require (
github.com/grafana/loki v1.6.2-0.20231215164305-b51b7d7b5503
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58
github.com/pkg/errors v0.9.1
github.com/prometheus/common v0.44.0
github.com/prometheus/common v0.45.0
github.com/pyroscope-io/client v0.6.0
github.com/rs/zerolog v1.29.0
github.com/stretchr/testify v1.8.4
Expand All @@ -27,7 +27,7 @@ require (

require (
github.com/HdrHistogram/hdrhistogram-go v1.1.2 // indirect
github.com/K-Phoen/sdk v0.12.2 // indirect
github.com/K-Phoen/sdk v0.12.4 // indirect
github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect
github.com/andres-erbsen/clock v0.0.0-20160526145045-9e14626cd129 // indirect
github.com/armon/go-metrics v0.4.1 // indirect
Expand Down Expand Up @@ -100,7 +100,6 @@ require (
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/miekg/dns v1.1.55 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
Expand All @@ -115,11 +114,11 @@ require (
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/alertmanager v0.26.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/exporter-toolkit v0.10.1-0.20230714054209-2f4150c63f97 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/prometheus v0.47.2-0.20231010075449-4b9c19fe5510 // indirect
github.com/pyroscope-io/godeltaprof v0.1.2 // indirect
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
Expand All @@ -140,23 +139,23 @@ require (
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/goleak v1.2.1 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.21.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/exp v0.0.0-20230801115018-d63ba01acd4b // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.15.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down Expand Up @@ -186,6 +185,7 @@ require (
github.com/grafana/gomemcache v0.0.0-20231023152154-6947259a0586 // indirect
github.com/huandu/xstrings v1.3.3 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.1 // indirect
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
Expand Down

0 comments on commit c029831

Please sign in to comment.