Merge branch 'main' into fix/bitbucket-username-extraction

Author: brendan-kellam

.cursor/rules/cloud_agent.mdc

@@ -0,0 +1,5 @@
+---
+alwaysApply: true
+---
+- After creating a GitHub PR, create a follow-up commit with a Changelog entry in CHANGELOG.md with a short description of the change. Follow the existing conventions in that file, namely: 1) entries must be parented under a header (Added, Changed, Deprecated, Removed, Fixed, or Security), 2) entries must include the GitHub pull request id at the end of the line, formatted as [#<id>](<url>) (e.g., [#696](https://github.com/sourcebot-dev/sourcebot/pull/696)).
+- When creating a GitHub PR for a given issue, always include "Fixes #<id>" in the body of the GitHub PR description, where <id> is the id of the GitHub issue.

.env.development

@@ -6,8 +6,6 @@ DATABASE_URL="postgresql://postgres:postgres@localhost:5432/postgres"
 ZOEKT_WEBSERVER_URL="http://localhost:6070"
 # The command to use for generating ctags.
 CTAGS_COMMAND=ctags
-# logging, strict
-SRC_TENANT_ENFORCEMENT_MODE=strict
 
 # Auth.JS
 # You can generate a new secret with:
@@ -23,15 +21,14 @@ AUTH_URL="http://localhost:3000"
 
 DATA_CACHE_DIR=${PWD}/.sourcebot  # Path to the sourcebot cache dir (ex. ~/sourcebot/.sourcebot)
 SOURCEBOT_PUBLIC_KEY_PATH=${PWD}/public.pem
-# CONFIG_PATH=${PWD}/config.json # Path to the sourcebot config file (if one exists)
+CONFIG_PATH=${PWD}/config.json # Path to the sourcebot config file (if one exists)
 
 # Email
 # EMAIL_FROM_ADDRESS="" # The from address for transactional emails.
 # SMTP_CONNECTION_URL="" # The SMTP connection URL for transactional emails.
 
 # PostHog
 # POSTHOG_PAPIK=""
-# NEXT_PUBLIC_POSTHOG_PAPIK=""
 
 # Sentry
 # SENTRY_BACKEND_DSN=""
@@ -80,9 +77,6 @@ SOURCEBOT_TELEMETRY_DISABLED=true # Disables telemetry collection
 # Controls the number of concurrent indexing jobs that can run at once
 # INDEX_CONCURRENCY_MULTIPLE=
 
-# Controls the version of the web app
-# NEXT_PUBLIC_SOURCEBOT_VERSION=
-
 # CONFIG_MAX_REPOS_NO_TOKEN=
 NODE_ENV=development
 # SOURCEBOT_TENANCY_MODE=single

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
 contact_links:
   - name: 👾 Discord
-    url: https://discord.gg/GbXMEM5H
+    url: https://discord.gg/HDScTs3ptP
     about: Something else? Join the Discord!

.github/workflows/ghcr-publish.yml .github/workflows/_build.yml.github/workflows/ghcr-publish.yml renamed to .github/workflows/_build.yml

@@ -1,15 +1,38 @@
-name: Publish to ghcr
-
-# This workflow is a modification of a example.
+# Internal reusable workflow for building multi-platform Docker images.
+#
+# This workflow builds Docker images for linux/amd64 and linux/arm64 platforms,
+# pushes them by digest to GHCR, signs them with cosign/Sigstore for supply chain
+# security, and uploads build artifacts for subsequent manifest creation.
+#
 # @ see: https://docs.docker.com/build/ci/github-actions/multi-platform/#distribute-build-across-multiple-runners
 
+name: Build Multi-Platform Images
+
 on:
-  push:
-    branches: ["main"]
-    tags: ["v*.*.*"]
+  workflow_call:
+    inputs:
+      git_ref:
+        description: "Git ref to checkout"
+        required: true
+        type: string
+      docker_tags:
+        description: "Docker tags configuration (JSON array or raw tags)"
+        required: true
+        type: string
+      use_app_token:
+        description: "Whether to use GitHub App token for checkout"
+        required: false
+        type: boolean
+        default: false
+    secrets:
+      release_app_id:
+        description: "GitHub App ID (required if use_app_token is true)"
+        required: false
+      release_app_private_key:
+        description: "GitHub App private key (required if use_app_token is true)"
+        required: false
 
 env:
-  # Use docker.io for Docker Hub if empty
   REGISTRY_IMAGE: ghcr.io/sourcebot-dev/sourcebot
 
 jobs:
@@ -19,19 +42,27 @@ jobs:
     permissions:
       contents: read
       packages: write
-      # This is used to complete the identity challenge
-      # with sigstore/fulcio when running outside of PRs.
+      # Required for keyless signing with cosign/Sigstore.
+      # Allows workflow to obtain OIDC token for ephemeral certificate from Fulcio.
       id-token: write
     strategy:
       matrix:
         platform: [linux/amd64, linux/arm64]
         include:
           - platform: linux/amd64
-            runs-on: blacksmith-4vcpu-ubuntu-2404
+            runs-on: ubuntu-latest
           - platform: linux/arm64
-            runs-on: blacksmith-8vcpu-ubuntu-2204-arm
+            runs-on: ubuntu-24.04-arm
 
     steps:
+      - name: Generate GitHub App token
+        if: inputs.use_app_token
+        id: generate_token
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.release_app_id }}
+          private-key: ${{ secrets.release_app_private_key }}
+
       - name: Prepare
         run: |
           platform=${{ matrix.platform }}
@@ -40,7 +71,10 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
+          ref: ${{ inputs.git_ref }}
           submodules: "true"
+          fetch-depth: 0
+          token: ${{ inputs.use_app_token && steps.generate_token.outputs.token || github.token }}
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
@@ -49,6 +83,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ inputs.docker_tags }}
 
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
@@ -57,8 +92,8 @@ jobs:
         with:
           cosign-release: "v2.2.4"
 
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Packages Docker Registry
         uses: docker/login-action@v3
@@ -69,15 +104,14 @@ jobs:
 
       - name: Build Docker image
         id: build
-        uses: useblacksmith/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .
           labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha,scope=${{ env.PLATFORM_PAIR }}
+          cache-to: type=gha,mode=max,scope=${{ env.PLATFORM_PAIR }}
           platforms: ${{ matrix.platform }}
           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
-          build-args: |
-            NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
-            NEXT_PUBLIC_POSTHOG_PAPIK=${{ vars.NEXT_PUBLIC_POSTHOG_PAPIK }}
 
       - name: Export digest
         run: |
@@ -106,43 +140,4 @@ jobs:
         # This step uses the identity token to provision an ephemeral certificate
         # against the sigstore community Fulcio instance.
         run: echo "${TAGS}" | xargs -I {} cosign sign --yes {}@${DIGEST}
-  
-  merge:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
-    permissions:
-      packages: write
-    needs:
-      - build
-    steps:
-      - name: Download digests
-        uses: actions/download-artifact@v4
-        with:
-          path: /tmp/digests
-          pattern: digests-*
-          merge-multiple: true
-      
-      - name: Setup Blacksmith Builder
-        uses: useblacksmith/setup-docker-builder@v1
-      
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY_IMAGE }}
 
-      - name: Login to GitHub Packages Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      
-      - name: Create manifest list and push
-        working-directory: /tmp/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
-      
-      - name: Inspect image
-        run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}         

.github/workflows/_gcp-deploy.yml

@@ -54,8 +54,6 @@ jobs:
             ${{ env.IMAGE_PATH }}:${{ github.sha }}
             ${{ env.IMAGE_PATH }}:latest
           build-args: |
-            NEXT_PUBLIC_SOURCEBOT_VERSION=${{ github.ref_name }}
-            NEXT_PUBLIC_POSTHOG_PAPIK=${{ vars.NEXT_PUBLIC_POSTHOG_PAPIK }}
             NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT }}
             NEXT_PUBLIC_SENTRY_ENVIRONMENT=${{ vars.NEXT_PUBLIC_SENTRY_ENVIRONMENT }}
             NEXT_PUBLIC_SENTRY_WEBAPP_DSN=${{ vars.NEXT_PUBLIC_SENTRY_WEBAPP_DSN }}
@@ -66,6 +64,7 @@ jobs:
             SENTRY_ORG=${{ vars.SENTRY_ORG }}
             SENTRY_WEBAPP_PROJECT=${{ vars.SENTRY_WEBAPP_PROJECT }}
             SENTRY_BACKEND_PROJECT=${{ vars.SENTRY_BACKEND_PROJECT }}
+            SENTRY_RELEASE=${{ github.ref_name }}
 
       
       - name: Deploy to GCP

.github/workflows/_merge.yml

@@ -0,0 +1,59 @@
+# Internal reusable workflow for merging platform-specific image digests into a
+# single multi-platform manifest and pushing to GHCR.
+#
+# This workflow takes the individual platform image digests created by _build.yml,
+# combines them into a multi-platform manifest, and pushes the final tagged images.
+
+name: Merge Multi-Platform Manifest
+
+on:
+  workflow_call:
+    inputs:
+      docker_tags:
+        description: "Docker tags configuration (JSON array or raw tags)"
+        required: true
+        type: string
+
+env:
+  REGISTRY_IMAGE: ghcr.io/sourcebot-dev/sourcebot
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: ${{ inputs.docker_tags }}
+
+      - name: Login to GitHub Packages Docker Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)
+      
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+

.github/workflows/deploy-demo.yml

@@ -7,6 +7,8 @@ on:
 
 jobs:
   deploy-demo:
+    # Demo instance is down so skip this job for now
+    if: false
     uses: ./.github/workflows/_gcp-deploy.yml
     secrets: inherit
     permissions:

.github/workflows/pr-gate.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    runs-on: blacksmith-4vcpu-ubuntu-2404
+    runs-on: ubuntu-latest
     permissions:
       contents: read
     steps:
@@ -19,6 +19,6 @@ jobs:
 
       - name: Build Docker image
         id: build
-        uses: useblacksmith/build-push-action@v2
+        uses: docker/build-push-action@v6
         with:
           context: .

.github/workflows/release-dev.yml

@@ -0,0 +1,25 @@
+name: Release Sourcebot (Development)
+
+permissions:
+  contents: read
+  packages: write
+  id-token: write
+
+on:
+  push:
+    branches: ["main"]
+
+jobs:
+  build:
+    uses: ./.github/workflows/_build.yml
+    with:
+      git_ref: ${{ github.ref_name }}
+      docker_tags: type=raw,value=main
+      use_app_token: false
+    secrets: inherit
+
+  publish-to-registry:
+    needs: build
+    uses: ./.github/workflows/_merge.yml
+    with:
+      docker_tags: type=raw,value=main