Skip to content

Commit b569199

Browse files
bake version into version.ts
1 parent 00eb3e0 commit b569199

File tree

17 files changed

+73
-49
lines changed

17 files changed

+73
-49
lines changed

.env.development

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
7777
# Controls the number of concurrent indexing jobs that can run at once
7878
# INDEX_CONCURRENCY_MULTIPLE=
7979

80-
# Controls the version of the web app
81-
# NEXT_PUBLIC_SOURCEBOT_VERSION=
82-
8380
# CONFIG_MAX_REPOS_NO_TOKEN=
8481
NODE_ENV=development
8582
# SOURCEBOT_TENANCY_MODE=single

.github/workflows/_gcp-deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
${{ env.IMAGE_PATH }}:${{ github.sha }}
5555
${{ env.IMAGE_PATH }}:latest
5656
build-args: |
57-
NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
5857
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT }}
5958
NEXT_PUBLIC_SENTRY_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
6059
NEXT_PUBLIC_SENTRY_WEBAPP_DSN=${{ vars.NEXT_PUBLIC_SENTRY_WEBAPP_DSN }}
@@ -65,6 +64,7 @@ jobs:
6564
SENTRY_ORG=${{ vars.SENTRY_ORG }}
6665
SENTRY_WEBAPP_PROJECT=${{ vars.SENTRY_WEBAPP_PROJECT }}
6766
SENTRY_BACKEND_PROJECT=${{ vars.SENTRY_BACKEND_PROJECT }}
67+
SENTRY_RELEASE=${{ github.ref_name }}
6868
6969
7070
- name: Deploy to GCP

.github/workflows/ghcr-publish.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ on:
77
push:
88
branches: ["main"]
99
tags: ["v*.*.*"]
10+
workflow_call:
11+
inputs:
12+
version:
13+
description: 'Version tag (e.g., v4.10.5)'
14+
required: false
15+
type: string
1016

1117
env:
1218
# Use docker.io for Docker Hub if empty
@@ -40,6 +46,7 @@ jobs:
4046
- name: Checkout repository
4147
uses: actions/checkout@v4
4248
with:
49+
ref: ${{ inputs.version || github.ref_name }}
4350
submodules: "true"
4451

4552
# Extract metadata (tags, labels) for Docker
@@ -77,8 +84,6 @@ jobs:
7784
cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
7885
platforms: ${{ matrix.platform }}
7986
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
80-
build-args: |
81-
NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
8287

8388
- name: Export digest
8489
run: |

.github/workflows/release-sourcebot.yml

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
exit 1
4242
fi
4343
44-
- name: Update CHANGELOG.md
44+
- name: Update CHANGELOG.md and version.ts
4545
run: |
4646
VERSION="${{ inputs.version }}"
4747
DATE=$(date +%Y-%m-%d)
@@ -54,15 +54,23 @@ jobs:
5454
echo "Updated CHANGELOG.md with version $VERSION"
5555
cat CHANGELOG.md | head -n 15
5656
57+
# Update version.ts
58+
cat > packages/shared/src/version.ts << EOF
59+
// This file is auto-generated by .github/workflows/release-sourcebot.yml
60+
export const SOURCEBOT_VERSION = "v$VERSION";
61+
EOF
62+
echo "Updated version.ts with version v$VERSION"
63+
cat packages/shared/src/version.ts
64+
5765
- name: Configure git
5866
run: |
5967
git config user.name "github-actions[bot]"
6068
git config user.email "github-actions[bot]@users.noreply.github.com"
6169
62-
- name: Commit CHANGELOG
70+
- name: Commit changes
6371
run: |
6472
VERSION="${{ inputs.version }}"
65-
git add CHANGELOG.md
73+
git add CHANGELOG.md packages/shared/src/version.ts
6674
git commit -m "Release v$VERSION"
6775
6876
- name: Create annotated tag
@@ -84,3 +92,13 @@ jobs:
8492
--verify-tag \
8593
--generate-notes \
8694
--latest
95+
96+
publish:
97+
needs: release
98+
uses: ./.github/workflows/ghcr-publish.yml
99+
with:
100+
version: v${{ inputs.version }}
101+
permissions:
102+
contents: read
103+
packages: write
104+
id-token: write

Dockerfile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
# in the webapp.
99
# @see: https://docs.docker.com/build/building/variables/#scoping
1010

11-
ARG NEXT_PUBLIC_SOURCEBOT_VERSION
1211
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
1312
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
1413
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
@@ -51,8 +50,6 @@ RUN yarn workspace @sourcebot/query-language install
5150
FROM node-alpine AS web-builder
5251
ENV SKIP_ENV_VALIDATION=1
5352
# -----------
54-
ARG NEXT_PUBLIC_SOURCEBOT_VERSION
55-
ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
5653
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
5754
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
5855
ARG NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT
@@ -72,7 +69,8 @@ ARG SENTRY_ORG
7269
ENV SENTRY_ORG=$SENTRY_ORG
7370
ARG SENTRY_WEBAPP_PROJECT
7471
ENV SENTRY_WEBAPP_PROJECT=$SENTRY_WEBAPP_PROJECT
75-
ENV SENTRY_RELEASE=$NEXT_PUBLIC_SOURCEBOT_VERSION
72+
ARG SENTRY_RELEASE
73+
ENV SENTRY_RELEASE=$SENTRY_RELEASE
7674
# SMUAT = Source Map Upload Auth Token
7775
ARG SENTRY_SMUAT
7876
ENV SENTRY_SMUAT=$SENTRY_SMUAT
@@ -102,8 +100,6 @@ ENV SKIP_ENV_VALIDATION=0
102100
FROM node-alpine AS backend-builder
103101
ENV SKIP_ENV_VALIDATION=1
104102
# -----------
105-
ARG NEXT_PUBLIC_SOURCEBOT_VERSION
106-
ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
107103

108104
# To upload source maps to Sentry, we need to set the following build-time args.
109105
# It's important that we don't set these for oss builds, otherwise the Sentry
@@ -115,6 +111,8 @@ ENV SENTRY_BACKEND_PROJECT=$SENTRY_BACKEND_PROJECT
115111
# SMUAT = Source Map Upload Auth Token
116112
ARG SENTRY_SMUAT
117113
ENV SENTRY_SMUAT=$SENTRY_SMUAT
114+
ARG SENTRY_RELEASE
115+
ENV SENTRY_RELEASE=$SENTRY_RELEASE
118116
# -----------
119117

120118
WORKDIR /app
@@ -132,12 +130,12 @@ RUN yarn workspace @sourcebot/backend install
132130
RUN yarn workspace @sourcebot/backend build
133131

134132
# Upload source maps to Sentry if we have the necessary build-time args.
135-
RUN if [ -n "$SENTRY_SMUAT" ] && [ -n "$SENTRY_ORG" ] && [ -n "$SENTRY_BACKEND_PROJECT" ] && [ -n "$NEXT_PUBLIC_SOURCEBOT_VERSION" ]; then \
133+
RUN if [ -n "$SENTRY_SMUAT" ] && [ -n "$SENTRY_ORG" ] && [ -n "$SENTRY_BACKEND_PROJECT" ] && [ -n "$SENTRY_RELEASE" ]; then \
136134
apk add --no-cache curl; \
137135
curl -sL https://sentry.io/get-cli/ | sh; \
138136
sentry-cli login --auth-token $SENTRY_SMUAT; \
139-
sentry-cli sourcemaps inject --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $NEXT_PUBLIC_SOURCEBOT_VERSION ./packages/backend/dist; \
140-
sentry-cli sourcemaps upload --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $NEXT_PUBLIC_SOURCEBOT_VERSION ./packages/backend/dist; \
137+
sentry-cli sourcemaps inject --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $SENTRY_RELEASE ./packages/backend/dist; \
138+
sentry-cli sourcemaps upload --org $SENTRY_ORG --project $SENTRY_BACKEND_PROJECT --release $SENTRY_RELEASE ./packages/backend/dist; \
141139
fi
142140

143141
ENV SKIP_ENV_VALIDATION=0
@@ -146,8 +144,6 @@ ENV SKIP_ENV_VALIDATION=0
146144
# ------ Runner ------
147145
FROM node-alpine AS runner
148146
# -----------
149-
ARG NEXT_PUBLIC_SOURCEBOT_VERSION
150-
ENV NEXT_PUBLIC_SOURCEBOT_VERSION=$NEXT_PUBLIC_SOURCEBOT_VERSION
151147
ARG NEXT_PUBLIC_SENTRY_ENVIRONMENT
152148
ENV NEXT_PUBLIC_SENTRY_ENVIRONMENT=$NEXT_PUBLIC_SENTRY_ENVIRONMENT
153149
ARG NEXT_PUBLIC_SENTRY_WEBAPP_DSN
@@ -160,8 +156,6 @@ ARG NEXT_PUBLIC_LANGFUSE_BASE_URL
160156
ENV NEXT_PUBLIC_LANGFUSE_BASE_URL=$NEXT_PUBLIC_LANGFUSE_BASE_URL
161157
# -----------
162158

163-
RUN echo "Sourcebot Version: $NEXT_PUBLIC_SOURCEBOT_VERSION"
164-
165159
WORKDIR /app
166160
ENV NODE_ENV=production
167161
ENV NEXT_TELEMETRY_DISABLED=1

entrypoint.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,15 @@ else
6363
export REDIS_EMBEDDED="false"
6464
fi
6565

66+
# Extract version from version.ts
67+
VERSION_FILE="/app/packages/shared/src/version.ts"
68+
if [ -f "$VERSION_FILE" ]; then
69+
SOURCEBOT_VERSION=$(grep -o '"v[^"]*"' "$VERSION_FILE" | tr -d '"')
70+
else
71+
SOURCEBOT_VERSION="unknown"
72+
fi
6673

67-
echo -e "\e[34m[Info] Sourcebot version: $NEXT_PUBLIC_SOURCEBOT_VERSION\e[0m"
74+
echo -e "\e[34m[Info] Sourcebot version: $SOURCEBOT_VERSION\e[0m"
6875

6976
if [ -n "$SOURCEBOT_TELEMETRY_DISABLED" ]; then
7077
# Validate that SOURCEBOT_TELEMETRY_DISABLED is either "true" or "false"
@@ -157,7 +164,7 @@ if [ ! -f "$FIRST_RUN_FILE" ]; then
157164
"event": "install",
158165
"distinct_id": "'"$SOURCEBOT_INSTALL_ID"'",
159166
"properties": {
160-
"sourcebot_version": "'"$NEXT_PUBLIC_SOURCEBOT_VERSION"'"
167+
"sourcebot_version": "'"$SOURCEBOT_VERSION"'"
161168
}
162169
}' https://us.i.posthog.com/capture/ ) then
163170
echo -e "\e[33m[Warning] Failed to send install event.\e[0m"
@@ -168,8 +175,8 @@ else
168175
PREVIOUS_VERSION=$(cat "$FIRST_RUN_FILE" | jq -r '.version')
169176

170177
# If the version has changed, we assume an upgrade has occurred.
171-
if [ "$PREVIOUS_VERSION" != "$NEXT_PUBLIC_SOURCEBOT_VERSION" ]; then
172-
echo -e "\e[34m[Info] Upgraded from version $PREVIOUS_VERSION to $NEXT_PUBLIC_SOURCEBOT_VERSION\e[0m"
178+
if [ "$PREVIOUS_VERSION" != "$SOURCEBOT_VERSION" ]; then
179+
echo -e "\e[34m[Info] Upgraded from version $PREVIOUS_VERSION to $SOURCEBOT_VERSION\e[0m"
173180

174181
if [ "$SOURCEBOT_TELEMETRY_DISABLED" = "false" ]; then
175182
if ! ( curl -L --output /dev/null --silent --fail --header "Content-Type: application/json" -d '{
@@ -178,7 +185,7 @@ else
178185
"distinct_id": "'"$SOURCEBOT_INSTALL_ID"'",
179186
"properties": {
180187
"from_version": "'"$PREVIOUS_VERSION"'",
181-
"to_version": "'"$NEXT_PUBLIC_SOURCEBOT_VERSION"'"
188+
"to_version": "'"$SOURCEBOT_VERSION"'"
182189
}
183190
}' https://us.i.posthog.com/capture/ ) then
184191
echo -e "\e[33m[Warning] Failed to send upgrade event.\e[0m"
@@ -187,7 +194,7 @@ else
187194
fi
188195
fi
189196

190-
echo "{\"version\": \"$NEXT_PUBLIC_SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL_ID\"}" > "$FIRST_RUN_FILE"
197+
echo "{\"version\": \"$SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL_ID\"}" > "$FIRST_RUN_FILE"
191198

192199
# Start the database and wait for it to be ready before starting any other service
193200
if [ "$DATABASE_EMBEDDED" = "true" ]; then

packages/backend/src/instrument.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import * as Sentry from "@sentry/node";
2-
import { createLogger } from "@sourcebot/shared";
2+
import { createLogger, SOURCEBOT_VERSION } from "@sourcebot/shared";
33
import { env } from "@sourcebot/shared/client";
44

55
const logger = createLogger('instrument');
66

77
if (!!env.NEXT_PUBLIC_SENTRY_BACKEND_DSN && !!env.NEXT_PUBLIC_SENTRY_ENVIRONMENT) {
88
Sentry.init({
99
dsn: env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
10-
release: env.NEXT_PUBLIC_SOURCEBOT_VERSION,
10+
release: SOURCEBOT_VERSION,
1111
environment: env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
1212
});
1313
} else {

packages/backend/src/posthog.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { env as clientEnv } from "@sourcebot/shared/client";
2-
import { env } from "@sourcebot/shared";
1+
import { env, SOURCEBOT_VERSION } from "@sourcebot/shared";
32
import { PostHog } from 'posthog-node';
43
import { PosthogEvent, PosthogEventMap } from './posthogEvents.js';
54

@@ -24,7 +23,7 @@ export function captureEvent<E extends PosthogEvent>(event: E, properties: Posth
2423
event: event,
2524
properties: {
2625
...properties,
27-
sourcebot_version: clientEnv.NEXT_PUBLIC_SOURCEBOT_VERSION,
26+
sourcebot_version: SOURCEBOT_VERSION,
2827
},
2928
});
3029
}

packages/shared/src/env.client.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ export const env = createEnv({
66
clientPrefix: "NEXT_PUBLIC_",
77
client: {
88
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: z.enum(SOURCEBOT_CLOUD_ENVIRONMENT).optional(),
9-
NEXT_PUBLIC_SOURCEBOT_VERSION: z.string().default("unknown"),
109
NEXT_PUBLIC_SENTRY_BACKEND_DSN: z.string().optional(),
1110
NEXT_PUBLIC_SENTRY_ENVIRONMENT: z.string().optional(),
1211
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: z.string().optional(),
1312
NEXT_PUBLIC_LANGFUSE_BASE_URL: z.string().optional()
1413
},
1514
runtimeEnvStrict: {
1615
NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT: process.env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT,
17-
NEXT_PUBLIC_SOURCEBOT_VERSION: process.env.NEXT_PUBLIC_SOURCEBOT_VERSION,
1816
NEXT_PUBLIC_SENTRY_BACKEND_DSN: process.env.NEXT_PUBLIC_SENTRY_BACKEND_DSN,
1917
NEXT_PUBLIC_SENTRY_ENVIRONMENT: process.env.NEXT_PUBLIC_SENTRY_ENVIRONMENT,
2018
NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY: process.env.NEXT_PUBLIC_LANGFUSE_PUBLIC_KEY,
Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
export * from "./constants.js";
22
export {
33
env
4-
} from "./env.client.js";
4+
} from "./env.client.js";
5+
export {
6+
SOURCEBOT_VERSION,
7+
} from "./version.js";

0 commit comments

Comments
 (0)