Skip to content

Commit 6bb53c7

Browse files
authored
Merge branch 'main' into feat/apidiff-go-v2
2 parents c8aab99 + 33cb8e0 commit 6bb53c7

File tree

200 files changed

+9269
-612
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+9269
-612
lines changed

.github/workflows/golangci_lint.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ jobs:
2222
if: ${{ github.event_name != 'merge_group' }}
2323
needs: detect-modules
2424
runs-on: ubuntu-latest
25+
# Modules are independent
26+
continue-on-error: true
2527
strategy:
2628
matrix:
2729
module: ${{ fromJSON(needs.detect-modules.outputs.modules) }}
@@ -42,14 +44,29 @@ jobs:
4244
version=$(grep '^golangci-lint ' .tool-versions | awk '{print $2}')
4345
echo "version=${version}" | tee -a "$GITHUB_OUTPUT"
4446
47+
- name: Sanitize artifact name
48+
id: artifact-name
49+
env:
50+
MODULE: ${{ matrix.module }}
51+
run: |
52+
safe_name="${MODULE#./}"
53+
safe_name="${safe_name#/}"
54+
safe_name="${safe_name//\//-}"
55+
if [[ -z "$safe_name" || "$safe_name" = "." ]]; then
56+
safe_name="root"
57+
fi
58+
echo "value=golangci-lint-report-${safe_name}" | tee -a "$GITHUB_OUTPUT"
59+
4560
- name: golangci-lint ${{ matrix.module }}
4661
if: ${{ always() && !contains(join(github.event.pull_request.labels.*.name, ' '), 'allow-lint-issues') }}
4762
# NOTE: Keep this version in sync with ACTION_CI_LINT_GO_GIT_TAG in ./script/lint.sh
48-
uses: smartcontractkit/.github/actions/ci-lint-go@ci-lint-go/3.0.0
63+
uses: smartcontractkit/.github/actions/ci-lint-go@ci-lint-go/v4
4964
with:
5065
checkout-repo: false
66+
artifact-name: ${{ steps.artifact-name.outputs.value }}
5167
golangci-lint-version: v${{ steps.get-version.outputs.version }}
5268
go-directory: ${{ matrix.module }}
69+
golangci-lint-args: "--output.text.path=stdout --output.checkstyle.path=${{ github.workspace }}/${{ matrix.module }}/golangci-lint-report.xml"
5370

5471
golangci-lint:
5572
# Required sink job that waits for all lint jobs to complete

go.mod

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ require (
77
github.com/XSAM/otelsql v0.37.0
88
github.com/andybalholm/brotli v1.1.1
99
github.com/atombender/go-jsonschema v0.16.1-0.20240916205339-a74cd4e2851c
10+
github.com/buraksezer/consistent v0.10.0
1011
github.com/bytecodealliance/wasmtime-go/v28 v28.0.0
12+
github.com/cespare/xxhash/v2 v2.3.0
1113
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1214
github.com/dominikbraun/graph v0.23.0
1315
github.com/fxamacker/cbor/v2 v2.7.0
@@ -44,13 +46,13 @@ require (
4446
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20251124151448-0448aefdaab9
4547
github.com/smartcontractkit/chainlink-protos/linking-service/go v0.0.0-20251002192024-d2ad9222409b
4648
github.com/smartcontractkit/chainlink-protos/storage-service v0.3.0
47-
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20251020004840-4638e4262066
49+
github.com/smartcontractkit/chainlink-protos/workflows/go v0.0.0-20260106052706-6dd937cb5ec6
4850
github.com/smartcontractkit/freeport v0.1.3-0.20250716200817-cb5dfd0e369e
4951
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7
5052
github.com/smartcontractkit/libocr v0.0.0-20250912173940-f3ab0246e23d
5153
github.com/stretchr/testify v1.11.1
5254
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0
53-
go.opentelemetry.io/otel v1.38.0
55+
go.opentelemetry.io/otel v1.39.0
5456
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.12.2
5557
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.12.2
5658
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0
@@ -60,22 +62,22 @@ require (
6062
go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.13.0
6163
go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.36.0
6264
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0
63-
go.opentelemetry.io/otel/log v0.13.0
64-
go.opentelemetry.io/otel/metric v1.38.0
65-
go.opentelemetry.io/otel/sdk v1.38.0
66-
go.opentelemetry.io/otel/sdk/log v0.13.0
67-
go.opentelemetry.io/otel/sdk/metric v1.38.0
68-
go.opentelemetry.io/otel/trace v1.38.0
69-
go.uber.org/zap v1.27.0
70-
golang.org/x/crypto v0.45.0
71-
golang.org/x/exp v0.0.0-20250711185948-6ae5c78190dc
72-
golang.org/x/sync v0.18.0
73-
golang.org/x/time v0.12.0
74-
golang.org/x/tools v0.38.0
75-
gonum.org/v1/gonum v0.16.0
76-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5
77-
google.golang.org/grpc v1.75.0
78-
google.golang.org/protobuf v1.36.8
65+
go.opentelemetry.io/otel/log v0.15.0
66+
go.opentelemetry.io/otel/metric v1.39.0
67+
go.opentelemetry.io/otel/sdk v1.39.0
68+
go.opentelemetry.io/otel/sdk/log v0.15.0
69+
go.opentelemetry.io/otel/sdk/metric v1.39.0
70+
go.opentelemetry.io/otel/trace v1.39.0
71+
go.uber.org/zap v1.27.1
72+
golang.org/x/crypto v0.47.0
73+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96
74+
golang.org/x/sync v0.19.0
75+
golang.org/x/time v0.14.0
76+
golang.org/x/tools v0.41.0
77+
gonum.org/v1/gonum v0.17.0
78+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda
79+
google.golang.org/grpc v1.78.0
80+
google.golang.org/protobuf v1.36.11
7981
gopkg.in/yaml.v3 v3.0.1
8082
sigs.k8s.io/yaml v1.4.0
8183
)
@@ -88,7 +90,6 @@ require (
8890
github.com/buger/goterm v1.0.4 // indirect
8991
github.com/buger/jsonparser v1.1.1 // indirect
9092
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
91-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
9293
github.com/cloudevents/sdk-go/binding/format/protobuf/v2 v2.16.1 // indirect
9394
github.com/cloudevents/sdk-go/v2 v2.16.1 // indirect
9495
github.com/fatih/color v1.18.0 // indirect
@@ -135,24 +136,24 @@ require (
135136
github.com/prometheus/client_model v0.6.2 // indirect
136137
github.com/prometheus/common v0.65.0 // indirect
137138
github.com/prometheus/procfs v0.16.1 // indirect
138-
github.com/rogpeppe/go-internal v1.13.1 // indirect
139+
github.com/rogpeppe/go-internal v1.14.1 // indirect
139140
github.com/ryanuber/go-glob v1.0.0 // indirect
140141
github.com/sanity-io/litter v1.5.5 // indirect
141142
github.com/stretchr/objx v0.5.2 // indirect
142143
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
143144
github.com/x448/float16 v0.8.4 // indirect
144145
github.com/zeebo/xxh3 v1.0.2 // indirect
145-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
146+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
146147
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
147148
go.opentelemetry.io/proto/otlp v1.6.0 // indirect
148149
go.uber.org/multierr v1.11.0 // indirect
149-
golang.org/x/mod v0.29.0 // indirect
150-
golang.org/x/net v0.47.0 // indirect
151-
golang.org/x/sys v0.38.0 // indirect
152-
golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
153-
golang.org/x/term v0.37.0 // indirect
154-
golang.org/x/text v0.31.0 // indirect
150+
golang.org/x/mod v0.32.0 // indirect
151+
golang.org/x/net v0.49.0 // indirect
152+
golang.org/x/sys v0.40.0 // indirect
153+
golang.org/x/telemetry v0.0.0-20260109210033-bd525da824e2 // indirect
154+
golang.org/x/term v0.39.0 // indirect
155+
golang.org/x/text v0.33.0 // indirect
155156
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
156-
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
157+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
157158
gopkg.in/yaml.v2 v2.4.0 // indirect
158159
)

0 commit comments

Comments
 (0)