Skip to content

Commit f863953

Browse files
authored
Merge branch 'main' into rz/fix/gesture-lifecycle
2 parents 3b70966 + 952b180 commit f863953

30 files changed

Lines changed: 1125 additions & 157 deletions

File tree

.claude/skills/btrace-perfetto/SKILL.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,26 @@ Before starting, verify:
2222
```
2323
3. **Perfetto trace_processor**: Check if `/tmp/trace_processor` exists. If not, download it:
2424
```bash
25-
curl -sL "https://get.perfetto.dev/trace_processor" -o /tmp/trace_processor && chmod +x /tmp/trace_processor
25+
# Download trace_processor (--fail ensures HTTP errors don't leave a file behind)
26+
curl -sSL --fail "https://get.perfetto.dev/trace_processor" -o /tmp/trace_processor
27+
28+
# Verify magic bytes directly — file(1) output is too inconsistent across
29+
# versions/platforms to rely on for scripts or PIE binaries.
30+
magic=$(head -c 4 /tmp/trace_processor 2>/dev/null | od -An -vtx1 -N4 | tr -d ' \n')
31+
case "$magic" in
32+
2321*) ;; # #! shebang (script)
33+
7f454c46) ;; # ELF (Linux)
34+
cffaedfe|cefaedfe|feedfacf|feedface) ;; # Mach-O (macOS)
35+
cafebabe) ;; # Mach-O universal
36+
*)
37+
echo "Error: Downloaded file is not a valid script or executable (magic: ${magic:-empty})"
38+
rm -f /tmp/trace_processor
39+
exit 1
40+
;;
41+
esac
42+
43+
# Make executable only after verification
44+
chmod +x /tmp/trace_processor
2645
```
2746
4. **Device ABI**: Run `adb shell getprop ro.product.cpu.abi` — btrace only supports arm64-v8a and armeabi-v7a (no x86/x86_64)
2847

.github/workflows/agp-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
sudo udevadm trigger --name-match=kvm
5151
5252
- name: AVD cache
53-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
53+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
5454
id: avd-cache
5555
with:
5656
path: |

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
3333
- name: Cache buildSrc
34-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
34+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
3535
with:
3636
path: buildSrc/build
3737
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

.github/workflows/changelog-preview.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ permissions:
1515

1616
jobs:
1717
changelog-preview:
18-
uses: getsentry/craft/.github/workflows/changelog-preview.yml@ba01e596c4a4c07692f0de10b0d4fe05f3dd0292 # v2
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@97d0c4286f32a80d09c8b89366d762fecc3e27b6 # v2
1919
secrets: inherit

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # pin@v2
39+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # pin@v2
4040
with:
4141
languages: 'java'
4242

@@ -45,4 +45,4 @@ jobs:
4545
./gradlew buildForCodeQL --no-build-cache
4646
4747
- name: Perform CodeQL Analysis
48-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # pin@v2
48+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # pin@v2

.github/workflows/integration-tests-benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
with:
9393
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
9494

95-
- uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
95+
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
9696
id: app-plain-cache
9797
with:
9898
path: sentry-android-integration-tests/test-app-plain/build/outputs/apk/release/test-app-plain-release.apk

.github/workflows/integration-tests-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
3232
- name: Cache buildSrc
33-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
33+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
3434
with:
3535
path: buildSrc/build
3636
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

.github/workflows/integration-tests-ui-critical.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ jobs:
6767
target: google_apis
6868
channel: canary # Necessary for ATDs
6969
arch: x86_64
70-
- api-level: 34 # Android 14
71-
target: google_apis
72-
channel: canary # Necessary for ATDs
73-
arch: x86_64
7470
- api-level: 35 # Android 15
7571
target: google_apis
7672
channel: canary # Necessary for ATDs
@@ -90,7 +86,7 @@ jobs:
9086
sudo udevadm trigger --name-match=kvm
9187
9288
- name: AVD cache
93-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
89+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
9490
id: avd-cache
9591
with:
9692
path: |

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fetch-depth: 0
3535
submodules: 'recursive'
3636
- name: Prepare release
37-
uses: getsentry/craft@ba01e596c4a4c07692f0de10b0d4fe05f3dd0292 # v2
37+
uses: getsentry/craft@97d0c4286f32a80d09c8b89366d762fecc3e27b6 # v2
3838
env:
3939
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
4040
with:

.github/workflows/spring-boot-2-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
5252
- name: Cache buildSrc
53-
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5
53+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
5454
with:
5555
path: buildSrc/build
5656
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

0 commit comments

Comments
 (0)