From d33185c118118a662eac8e1737c38ec7f2436bc9 Mon Sep 17 00:00:00 2001 From: msukkari Date: Sat, 1 Mar 2025 20:43:23 -0800 Subject: [PATCH] switch source map publish to runtime in entrypoint --- .github/workflows/staging-ghcr-public.yml | 9 --------- Dockerfile | 1 + entrypoint.sh | 6 ++++++ packages/backend/package.json | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/staging-ghcr-public.yml b/.github/workflows/staging-ghcr-public.yml index 39428a59..b75532df 100644 --- a/.github/workflows/staging-ghcr-public.yml +++ b/.github/workflows/staging-ghcr-public.yml @@ -29,15 +29,6 @@ jobs: platform=${{ matrix.platform }} echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV - - name: Setup Sentry CLI - uses: matbour/setup-sentry-cli@v1 - with: - version: latest - - - name: Login to Sentry - run: | - sentry-cli login --auth-token ${{ secrets.SENTRY_AUTH_TOKEN }} - - name: Checkout repository uses: actions/checkout@v4 with: diff --git a/Dockerfile b/Dockerfile index 8333c01e..de5bd950 100644 --- a/Dockerfile +++ b/Dockerfile @@ -145,6 +145,7 @@ COPY --from=shared-libs-builder /app/packages/error ./packages/error # Configure dependencies 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 +RUN curl -sL https://sentry.io/get-cli/ | sh # Install grafana alloy. libc6-compat is required because alloy dynamically links against glibc which doesn't exist in alpine by default # @nochekin: figure out how to handle this for self hosted case (especially the config) diff --git a/entrypoint.sh b/entrypoint.sh index 4da68b43..f3f24641 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -187,6 +187,12 @@ echo "{\"version\": \"$SOURCEBOT_VERSION\", \"install_id\": \"$SOURCEBOT_INSTALL # done # } +# Upload sourcemaps to Sentry +# @nocheckin +su -c "sentry-cli login --auth-token $SENTRY_AUTH_TOKEN" +su -c "sentry-cli sourcemaps inject --org sourcebot --project backend /app/packages/backend/dist" +su -c "sentry-cli sourcemaps upload --org sourcebot --project backend /app/packages/backend/dist" + # Start the database and wait for it to be ready before starting any other service if [ "$DATABASE_URL" = "postgresql://postgres@localhost:5432/sourcebot" ]; then diff --git a/packages/backend/package.json b/packages/backend/package.json index 40849566..5bd58bb9 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -7,9 +7,8 @@ "scripts": { "dev:watch": "tsc-watch --preserveWatchOutput --onSuccess \"yarn dev --cacheDir ../../.sourcebot\"", "dev": "export PATH=\"$PWD/../../bin:$PATH\" && export CTAGS_COMMAND=ctags && node ./dist/index.js", - "build": "tsc && yarn sentry:sourcemaps", - "test": "vitest --config ./vitest.config.ts", - "sentry:sourcemaps": "sentry-cli sourcemaps inject --org sourcebot --project backend ./dist && sentry-cli sourcemaps upload --org sourcebot --project backend ./dist" + "build": "tsc", + "test": "vitest --config ./vitest.config.ts" }, "devDependencies": { "@types/argparse": "^2.0.16",