Merge branch 'master' into measure

Author: detj

.github/workflows/ci.yml

@@ -73,6 +73,8 @@ jobs:
     if: false
     name: Sentry-Symbolicator Tests
     runs-on: ubuntu-latest
+    env:
+      USE_NEW_DEVSERVICES: 1
 
     steps:
       - name: Install libcurl-dev
@@ -101,8 +103,8 @@ jobs:
         uses: ./.github/actions/setup-sentry
         with:
           workdir: sentry
-          kafka: true
-          snuba: true
+          use-new-devservices: true
+          mode: minimal
 
       - name: Do the localhost docker dance
         run: echo "$DJANGO_LIVE_TEST_SERVER_ADDRESS host.docker.internal" | sudo tee --append /etc/hosts

.github/workflows/image.yml

@@ -1,6 +1,7 @@
 name: image
 on:
   pull_request:
+    types: [opened, synchronize, reopened, labeled]
   push:
     branches:
       - measure
@@ -11,13 +12,47 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  # build-setup:
+  #   name: Setup build metadata
+  #   runs-on: ubuntu-latest
+
+  #   env:
+  #     FULL_CI: "${{
+  #       github.event_name != 'pull_request'
+  #       || contains(github.event.pull_request.labels.*.name, 'Trigger: Full-CI')
+  #     }}"
+
+  #   steps:
+  #     - id: set-outputs
+  #       run: |
+  #         echo "full_ci=$FULL_CI" >> $GITHUB_OUTPUT
+
+  #         if [[ "$FULL_CI" == "true" ]]; then
+  #           echo "Running full CI"
+  #           echo 'archs=["amd64", "arm64"]' >> $GITHUB_OUTPUT
+  #         else
+  #           echo "Skipping some CI steps"
+  #           echo 'archs=["amd64"]' >> $GITHUB_OUTPUT
+  #         fi
+  #   outputs:
+  #     archs: "${{ steps.set-outputs.outputs.archs }}"
+  #     full_ci: "${{ steps.set-outputs.outputs.full_ci }}"
+
+
   build-image:
     permissions:
       packages: write
     strategy:
       matrix:
-        arch: [amd64]
-    runs-on: ubuntu-20.04
+        # arch: ${{ fromJson(needs.build-setup.outputs.archs) }}
+        arch: ["amd64", "arm64"]
+
+    runs-on: |-
+      ${{fromJson('{
+        "amd64": "ubuntu-20.04",
+        "arm64": "ubuntu-22.04-arm64-relay"
+      }')[matrix.arch] }}
+
     env:
       # IMG_CACHE: ghcr.io/measure-sh/symbolicator:${{ matrix.arch }}-latest
       IMG_VERSIONED: ghcr.io/measure-sh/symbolicator:${{ matrix.arch }}-${{ github.sha }}
@@ -27,8 +62,9 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - run: docker run --rm --privileged tonistiigi/binfmt --install arm64
-        if: matrix.arch == 'arm64'
+
+      - name: Docker Login
+        run: docker login --username '${{ github.actor }}' --password '${{ secrets.GITHUB_TOKEN }}' ghcr.io
 
       - name: build builder img
         run: |
@@ -63,10 +99,9 @@ jobs:
               .
 
       - name: push all images
+        # if: "needs.build-setup.outputs.full_ci == 'true'"
         if: github.event_name != 'pull_request'
         run: |
-          set -euxo pipefail
-          docker login --username '${{ github.actor }}' --password '${{ secrets.GITHUB_TOKEN }}' ghcr.io
           docker push "$BUILDER_IMG_CACHE"
           docker push "$NIGHTLY_IMG_CACHE"
           docker push "$IMG_VERSIONED"

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       - name: Get auth token
         id: token
-        uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
+        uses: actions/create-github-app-token@c1a285145b9d317df6ced56c09f525b5c2b6f755 # v1.11.1
         with:
           app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
           private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## Unreleased
+
+### Dependencies
+
+- Bump Native SDK from v0.7.17 to v0.7.18 ([#1596](https://github.com/getsentry/symbolicator/pull/1596))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0718)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.17...0.7.18)
+
+## 25.1.0
+
+### Dependencies
+
+- Bump Native SDK from v0.7.16 to v0.7.17 ([#1573](https://github.com/getsentry/symbolicator/pull/1573))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0717)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.7.16...0.7.17)
+
 ## 24.12.1
 
 ### Various fixes & improvements

Cargo.lock

@@ -25,7 +25,7 @@ debug = 1
 [profile.release-lto]
 inherits = "release"
 codegen-units = 1
-lto = true
+lto = "thin"
 
 [profile.local]
 # For running a local symbolicator, we want the best of both worlds: a fast executable, with quick
@@ -56,7 +56,7 @@ cpp_demangle = { git = "https://github.com/getsentry/cpp_demangle", branch = "se
 
 [workspace.dependencies]
 reqwest = "0.12.2"
-symbolic = "12.13.1"
+symbolic = "12.13.2"
 tokio = "1.36.0"
 tokio-metrics = "0.3.1"
 tokio-util = "0.7.10"

Cargo.toml

@@ -1,5 +1,12 @@
 # CLI
-FROM getsentry/sentry-cli:2 AS sentry-cli
+FROM debian:bookworm-slim AS sentry-cli
+
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y --no-install-recommends ca-certificates curl \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN curl -sL https://sentry.io/get-cli/ | sh
 
 # Image with cargo-chef as base image to our builder
 FROM rust:slim-bookworm AS symbolicator-chef
@@ -41,7 +48,7 @@ RUN cp target/release-lto/symbolicator target/release-lto/symbolicator.debug \
     && cp ./target/release-lto/symbolicator /usr/local/bin \
     && zip /opt/symbolicator-debug.zip target/release-lto/symbolicator.debug
 
-COPY --from=sentry-cli /bin/sentry-cli /bin/sentry-cli
+COPY --from=sentry-cli /usr/local/bin/sentry-cli /bin/sentry-cli
 RUN sentry-cli --version \
     && SOURCE_BUNDLE="$(sentry-cli difutil bundle-sources ./target/release-lto/symbolicator.debug)" \
     && mv "$SOURCE_BUNDLE" /opt/symbolicator.src.zip