From 73a596edb5955c62489c87ca03ee78b6d54ae984 Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Tue, 11 Feb 2025 11:47:34 +0100 Subject: [PATCH 1/3] chore(deps): tidy dependencies --- go.mod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4c3ccc4d5ce..90a7c0460c9 100644 --- a/go.mod +++ b/go.mod @@ -34,6 +34,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/golang/protobuf v1.5.3 github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb + github.com/google/go-cmp v0.5.9 github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.3.0 github.com/gorilla/websocket v1.4.2 @@ -49,6 +50,7 @@ require ( github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 github.com/julienschmidt/httprouter v1.3.0 github.com/karalabe/usb v0.0.2 + github.com/kr/pretty v0.3.1 github.com/kylelemons/godebug v1.1.0 github.com/mattn/go-colorable v0.1.13 github.com/mattn/go-isatty v0.0.17 @@ -67,6 +69,7 @@ require ( go.uber.org/automaxprocs v1.5.2 golang.org/x/crypto v0.17.0 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa + golang.org/x/mod v0.14.0 golang.org/x/sync v0.5.0 golang.org/x/sys v0.16.0 golang.org/x/text v0.14.0 @@ -108,7 +111,6 @@ require ( github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect github.com/google/go-querystring v1.1.0 // indirect github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect @@ -118,7 +120,6 @@ require ( github.com/kilic/bls12-381 v0.1.0 // indirect github.com/klauspost/compress v1.15.15 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect - github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect github.com/mattn/go-runewidth v0.0.13 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect @@ -140,7 +141,6 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/mod v0.14.0 // indirect golang.org/x/net v0.18.0 // indirect google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect From d0f4b9f2926b9780252a77eb1849bb6d2f658745 Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Tue, 11 Feb 2025 11:50:26 +0100 Subject: [PATCH 2/3] chore(ci): add go_tidy job to go workflow --- .github/workflows/go.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 6e7b3fae13e..fa5d8a17beb 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -46,3 +46,15 @@ jobs: - name: git diff run: git diff --exit-code + + go_tidy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Go + uses: actions/setup-go@v5 + with: + go-version-file: "go.mod" + - run: | + go mod tidy + git diff --exit-code From 3c9a93c873aabe44f549f84b4aac8629d82a8b15 Mon Sep 17 00:00:00 2001 From: Quentin Mc Gaw Date: Tue, 11 Feb 2025 12:36:43 +0100 Subject: [PATCH 3/3] Separate steps for go mod tidy and git diff --- .github/workflows/go.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index fa5d8a17beb..221b0fb6ab2 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -55,6 +55,5 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: "go.mod" - - run: | - go mod tidy - git diff --exit-code + - run: go mod tidy + - run: git diff --exit-code