Skip to content

Commit c42098b

Browse files
Merge branch 'main' into bkellam/truboooooo_web
2 parents d311cf6 + c3fae1a commit c42098b

21 files changed

Lines changed: 335 additions & 174 deletions

File tree

.env.development

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
44

55
# Zoekt
66
ZOEKT_WEBSERVER_URL="http://localhost:6070"
7-
# SHARD_MAX_MATCH_COUNT=10000
8-
# TOTAL_MAX_MATCH_COUNT=100000
97
# The command to use for generating ctags.
108
CTAGS_COMMAND=ctags
119
# logging, strict

.github/workflows/deploy-demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Deploy Demo
22

33
on:
44
push:
5-
branches: ["main"]
5+
tags: ["v*.*.*"]
66
workflow_dispatch:
77

88
jobs:

.github/workflows/ghcr-publish.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ jobs:
2727
platform: [linux/amd64, linux/arm64]
2828
include:
2929
- platform: linux/amd64
30-
runs-on: ubuntu-latest
30+
runs-on: blacksmith-4vcpu-ubuntu-2404
3131
- platform: linux/arm64
32-
runs-on: ubuntu-24.04-arm
32+
runs-on: blacksmith-8vcpu-ubuntu-2204-arm
3333

3434
steps:
3535
- name: Prepare
@@ -57,8 +57,8 @@ jobs:
5757
with:
5858
cosign-release: "v2.2.4"
5959

60-
- name: Set up Docker Buildx
61-
uses: docker/setup-buildx-action@v3
60+
- name: Setup Blacksmith Builder
61+
uses: useblacksmith/setup-docker-builder@v1
6262

6363
- name: Login to GitHub Packages Docker Registry
6464
uses: docker/login-action@v3
@@ -69,12 +69,10 @@ jobs:
6969

7070
- name: Build Docker image
7171
id: build
72-
uses: docker/build-push-action@v6
72+
uses: useblacksmith/build-push-action@v2
7373
with:
7474
context: .
7575
labels: ${{ steps.meta.outputs.labels }}
76-
cache-from: type=gha,scope=${{ env.PLATFORM_PAIR }}
77-
cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
7876
platforms: ${{ matrix.platform }}
7977
outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true,annotation.org.opencontainers.image.description=Blazingly fast code search
8078
build-args: |
@@ -110,7 +108,7 @@ jobs:
110108
run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
111109

112110
merge:
113-
runs-on: ubuntu-latest
111+
runs-on: blacksmith-4vcpu-ubuntu-2404
114112
permissions:
115113
packages: write
116114
needs:
@@ -123,8 +121,8 @@ jobs:
123121
pattern: digests-*
124122
merge-multiple: true
125123

126-
- name: Set up Docker Buildx
127-
uses: docker/setup-buildx-action@v3
124+
- name: Setup Blacksmith Builder
125+
uses: useblacksmith/setup-docker-builder@v1
128126

129127
- name: Extract Docker metadata
130128
id: meta

.github/workflows/pr-gate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
build:
11-
runs-on: ubuntu-latest
11+
runs-on: blacksmith-4vcpu-ubuntu-2404
1212
permissions:
1313
contents: read
1414
steps:
@@ -19,6 +19,6 @@ jobs:
1919

2020
- name: Build Docker image
2121
id: build
22-
uses: docker/build-push-action@v6
22+
uses: useblacksmith/build-push-action@v2
2323
with:
2424
context: .

.github/workflows/test-backend.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: blacksmith-4vcpu-ubuntu-2404
1111
permissions:
1212
contents: read
1313
steps:

.github/workflows/test-web.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
build:
10-
runs-on: ubuntu-latest
10+
runs-on: blacksmith-4vcpu-ubuntu-2404
1111
permissions:
1212
contents: read
1313
steps:

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
<!-- @NOTE: On next release, please bump the MCP pacakge as there are breaking changes in this! -->
11+
12+
### Fixed
13+
- Fixed "dubious ownership" errors when cloning / fetching repos. [#553](https://github.com/sourcebot-dev/sourcebot/pull/553)
14+
15+
### Changed
16+
- Remove spam "login page loaded" log. [#552](https://github.com/sourcebot-dev/sourcebot/pull/552)
17+
- Improved search performance for unbounded search queries. [#555](https://github.com/sourcebot-dev/sourcebot/pull/555)
18+
1019
### Added
1120
- Added support for passing db connection url as seperate `DATABASE_HOST`, `DATABASE_USERNAME`, `DATABASE_PASSWORD`, `DATABASE_NAME`, and `DATABASE_ARGS` env vars. [#545](https://github.com/sourcebot-dev/sourcebot/pull/545)
1221

Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ COPY --from=shared-libs-builder /app/packages/shared ./packages/shared
233233
# Configure dependencies
234234
RUN apk add --no-cache git ca-certificates bind-tools tini jansson wget supervisor uuidgen curl perl jq redis postgresql postgresql-contrib openssl util-linux unzip
235235

236+
# Fixes git "dubious ownership" issues when the volume is mounted with different permissions to the container.
237+
RUN git config --global safe.directory "*"
238+
236239
# Configure the database
237240
RUN mkdir -p /run/postgresql && \
238241
chown -R postgres:postgres /run/postgresql && \

docs/docs/configuration/environment-variables.mdx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,13 @@ The following environment variables allow you to configure your Sourcebot deploy
2828
| `REDIS_REMOVE_ON_FAIL` | `100` | <p>Controls how many failed jobs are allowed to remain in Redis queues</p> |
2929
| `REPO_SYNC_RETRY_BASE_SLEEP_SECONDS` | `60` | <p>The base sleep duration (in seconds) for exponential backoff when retrying repository sync operations that fail</p> |
3030
| `GITLAB_CLIENT_QUERY_TIMEOUT_SECONDS` | `600` | <p>The timeout duration (in seconds) for GitLab client queries</p> |
31-
| `SHARD_MAX_MATCH_COUNT` | `10000` | <p>The maximum shard count per query</p> |
3231
| `SMTP_CONNECTION_URL` | `-` | <p>The url to the SMTP service used for sending transactional emails. See [this doc](/docs/configuration/transactional-emails) for more info.</p> |
3332
| `SOURCEBOT_ENCRYPTION_KEY` | Automatically generated at startup if no value is provided. Generated using `openssl rand -base64 24` | <p>Used to encrypt connection secrets and generate API keys.</p> |
3433
| `SOURCEBOT_PUBLIC_KEY_PATH` | `/app/public.pem` | <p>Sourcebot's public key that's used to verify encrypted license key signatures.</p> |
3534
| `SOURCEBOT_LOG_LEVEL` | `info` | <p>The Sourcebot logging level. Valid values are `debug`, `info`, `warn`, `error`, in order of severity.</p> |
3635
| `SOURCEBOT_STRUCTURED_LOGGING_ENABLED` | `false` | <p>Enables/disable structured JSON logging. See [this doc](/docs/configuration/structured-logging) for more info.</p> |
3736
| `SOURCEBOT_STRUCTURED_LOGGING_FILE` | - | <p>Optional file to log to if structured logging is enabled</p> |
3837
| `SOURCEBOT_TELEMETRY_DISABLED` | `false` | <p>Enables/disables telemetry collection in Sourcebot. See [this doc](/docs/overview.mdx#telemetry) for more info.</p> |
39-
| `TOTAL_MAX_MATCH_COUNT` | `100000` | <p>The maximum number of matches per query</p> |
40-
| `ZOEKT_MAX_WALL_TIME_MS` | `10000` | <p>The maximum real world duration (in milliseconds) per zoekt query</p> |
4138

4239
### Enterprise Environment Variables
4340
| Variable | Default | Description |

docs/docs/overview.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
title: "Overview"
33
---
44

5-
[Sourcebot](https://github.com/sourcebot-dev/sourcebot) is a self-hosted tool that helps you understand your codebase.
5+
[Sourcebot](https://github.com/sourcebot-dev/sourcebot) is a platform that helps humans and agents understand your codebase:
66

77
- [Code search](/docs/features/search/overview): Search and navigate across all your repos and branches, no matter where they’re hosted
88
- [Ask Sourcebot](/docs/features/ask): Ask questions about your codebase and have Sourcebot provide detailed answers grounded with inline citations
9+
- [MCP](/docs/features/mcp-server): Enrich agent context windows with code across your organization
910

1011
<CardGroup>
1112
<Card title="Deployment guide" icon="server" href="/docs/deployment-guide" horizontal="true">

0 commit comments

Comments
 (0)