From af644bf389b16db3448bf75867a3e6d62f4c5bb4 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Fri, 5 Dec 2025 09:10:20 -0800 Subject: [PATCH 1/3] trying to toggle snuba --- .github/workflows/ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1830b630a2..18c66d6808 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -304,6 +304,7 @@ jobs: with: repository: getsentry/sentry path: sentry + ref: hubertdeng123/add-toggle-setup-sentry-gha - name: Setup steps id: setup @@ -318,12 +319,10 @@ jobs: with: workdir: sentry mode: minimal + toggle: snuba - name: Start snuba run: | - # TODO(hubertdeng123): New devservices doesn't support running sentry without snuba yet, remove this when it does - docker stop snuba-snuba-1 - docker rm snuba-snuba-1 docker run -d --rm \ -p 127.0.0.1:1218:1218 \ -e PYTHONUNBUFFERED=1 \ From f87e11ae6ce7a46d2df93b73742bd7b1e15b843c Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Fri, 5 Dec 2025 09:45:24 -0800 Subject: [PATCH 2/3] attempt to set coderoot manually --- .github/workflows/ci.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 18c66d6808..150066ca9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,7 +303,7 @@ jobs: uses: actions/checkout@v6 with: repository: getsentry/sentry - path: sentry + path: ../sentry ref: hubertdeng123/add-toggle-setup-sentry-gha - name: Setup steps @@ -311,13 +311,19 @@ jobs: run: | # We cannot execute actions that are not placed under .github of the main repo mkdir -p .github/actions - cp -r sentry/.github/actions/* .github/actions + cp -r ../sentry/.github/actions/* .github/actions + + - name: Set Coderoot + run: | + # Create devenv config + mkdir -p ~/.config/sentry-devenv + echo -e "[devenv]\ncoderoot = $GITHUB_WORKSPACE/.." > ~/.config/sentry-devenv/config.ini - name: Setup Sentry id: setup-sentry uses: ./.github/actions/setup-sentry with: - workdir: sentry + workdir: ../sentry mode: minimal toggle: snuba @@ -342,7 +348,7 @@ jobs: - name: Run snuba tests if: needs.files-changed.outputs.api_changes == 'false' - working-directory: sentry + working-directory: ../sentry run: | pytest -k 'not __In' tests \ -m snuba_ci \ @@ -350,7 +356,7 @@ jobs: - name: Run full tests if: needs.files-changed.outputs.api_changes == 'true' - working-directory: sentry + working-directory: ../sentry run: | pytest -k 'not __In' \ tests/snuba \ @@ -372,7 +378,7 @@ jobs: - name: Run CI module tests if: needs.files-changed.outputs.api_changes == 'true' - working-directory: sentry + working-directory: ../sentry run: pytest -k 'not __In' tests -vv -m snuba_ci clickhouse-versions: From 9166a6ea5e5b84c81b617dde978e6dd91e677881 Mon Sep 17 00:00:00 2001 From: Hubert Deng Date: Fri, 5 Dec 2025 09:55:21 -0800 Subject: [PATCH 3/3] attempt again --- .github/workflows/ci.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 150066ca9e..624aa78cb2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -303,7 +303,7 @@ jobs: uses: actions/checkout@v6 with: repository: getsentry/sentry - path: ../sentry + path: sentry ref: hubertdeng123/add-toggle-setup-sentry-gha - name: Setup steps @@ -311,10 +311,9 @@ jobs: run: | # We cannot execute actions that are not placed under .github of the main repo mkdir -p .github/actions - cp -r ../sentry/.github/actions/* .github/actions - - - name: Set Coderoot - run: | + cp -r sentry/.github/actions/* .github/actions + # Move sentry to be a sibling of snuba so devenv can find both + mv sentry ../sentry # Create devenv config mkdir -p ~/.config/sentry-devenv echo -e "[devenv]\ncoderoot = $GITHUB_WORKSPACE/.." > ~/.config/sentry-devenv/config.ini