Skip to content

Commit d867e86

Browse files
committed
Merge branch 'main' into mcp-tools-support
# Conflicts: # config/config.example.json # pkg/config/config.go
2 parents a7a4e88 + 80c8b57 commit d867e86

File tree

159 files changed

+16997
-2896
lines changed

Some content is hidden

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

159 files changed

+16997
-2896
lines changed

.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# ANTHROPIC_API_KEY=sk-ant-xxx
66
# OPENAI_API_KEY=sk-xxx
77
# GEMINI_API_KEY=xxx
8+
# CEREBRAS_API_KEY=xxx
89

910
# ── Chat Channel ──────────────────────────
1011
# TELEGRAM_BOT_TOKEN=123456:ABC...

.github/workflows/build.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: build
22

33
on:
44
push:
5-
branches: ["main"]
5+
branches: [ "main" ]
66

77
jobs:
88
build:
@@ -16,10 +16,5 @@ jobs:
1616
with:
1717
go-version-file: go.mod
1818

19-
- name: fmt
20-
run: |
21-
make fmt
22-
git diff --exit-code || (echo "::error::Code is not formatted. Run 'make fmt' and commit the changes." && exit 1)
23-
2419
- name: Build
2520
run: make build-all

.github/workflows/pr.yml

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,48 +24,9 @@ jobs:
2424
with:
2525
version: v2.10.1
2626

27-
# TODO: Remove once linter is properly configured
28-
fmt-check:
29-
name: Formatting
30-
runs-on: ubuntu-latest
31-
steps:
32-
- name: Checkout
33-
uses: actions/checkout@v6
34-
35-
- name: Setup Go
36-
uses: actions/setup-go@v6
37-
with:
38-
go-version-file: go.mod
39-
40-
- name: Check formatting
41-
run: |
42-
make fmt
43-
git diff --exit-code || (echo "::error::Code is not formatted. Run 'make fmt' and commit the changes." && exit 1)
44-
45-
# TODO: Remove once linter is properly configured
46-
vet:
47-
name: Vet
48-
runs-on: ubuntu-latest
49-
needs: fmt-check
50-
steps:
51-
- name: Checkout
52-
uses: actions/checkout@v6
53-
54-
- name: Setup Go
55-
uses: actions/setup-go@v6
56-
with:
57-
go-version-file: go.mod
58-
59-
- name: Run go generate
60-
run: go generate ./...
61-
62-
- name: Run go vet
63-
run: go vet ./...
64-
6527
test:
6628
name: Tests
6729
runs-on: ubuntu-latest
68-
needs: fmt-check
6930
steps:
7031
- name: Checkout
7132
uses: actions/checkout@v6

.golangci.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ linters:
4747
- godox
4848
- goprintffuncname
4949
- gosec
50-
- govet
5150
- ineffassign
5251
- lll
5352
- maintidx
@@ -160,12 +159,11 @@ issues:
160159

161160
formatters:
162161
enable:
162+
- gci
163+
- gofmt
164+
- gofumpt
163165
- goimports
164-
# TODO: Disabled, because they are failing at the moment, we should fix them and enable (step by step)
165-
# - gci
166-
# - gofmt
167-
# - gofumpt
168-
# - golines
166+
- golines
169167
settings:
170168
gci:
171169
sections:

Makefile

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ LDFLAGS=-ldflags "-X main.version=$(VERSION) -X main.gitCommit=$(GIT_COMMIT) -X
1717
GO?=go
1818
GOFLAGS?=-v -tags stdjson
1919

20+
# Golangci-lint
21+
GOLANGCI_LINT?=golangci-lint
22+
2023
# Installation
2124
INSTALL_PREFIX?=$(HOME)/.local
2225
INSTALL_BIN_DIR=$(INSTALL_PREFIX)/bin
@@ -126,13 +129,17 @@ clean:
126129
vet:
127130
@$(GO) vet ./...
128131

129-
## fmt: Format Go code
132+
## test: Test Go code
130133
test:
131134
@$(GO) test ./...
132135

133136
## fmt: Format Go code
134137
fmt:
135-
@$(GO) fmt ./...
138+
@$(GOLANGCI_LINT) fmt
139+
140+
## lint: Run linters
141+
lint:
142+
@$(GOLANGCI_LINT) run
136143

137144
## deps: Download dependencies
138145
deps:

0 commit comments

Comments
 (0)