Skip to content

Commit cb4efff

Browse files
adinauerromtsnstefanosiano
authored
Merge main into 8.x.x with 7.20.0 being latest release (#4033)
* Merge main into 8.x.x * Remove redundant thread factory * Add RRWebOptionsEventSerializationTest * updated lost changes * updated tests * updated replay tests --------- Co-authored-by: Roman Zavarnitsyn <[email protected]> Co-authored-by: stefanosiano <[email protected]>
1 parent a509828 commit cb4efff

File tree

78 files changed

+2135
-853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2135
-853
lines changed

.github/workflows/agp-matrix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
java-version: '17'
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
41+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
4242
with:
4343
gradle-home-cache-cleanup: true
4444

@@ -70,7 +70,7 @@ jobs:
7070
arch: x86
7171
channel: canary # Necessary for ATDs
7272
disk-size: 4096M
73-
script: ./gradlew sentry-android-integration-tests:sentry-uitest-android:connectedReleaseAndroidTest -DtestBuildType=release --daemon
73+
script: ./gradlew sentry-android-integration-tests:sentry-uitest-android:connectedReleaseAndroidTest -DtestBuildType=release -Denvironment=github --daemon
7474

7575
- name: Upload test results
7676
if: always()

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ jobs:
2727
java-version: '17'
2828

2929
- name: Setup Gradle
30-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
30+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
3131
with:
3232
gradle-home-cache-cleanup: true
3333

3434
- name: Run Tests with coverage and Lint
3535
run: make preMerge
3636

3737
- name: Upload coverage to Codecov
38-
uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # pin@v4
38+
uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # pin@v4
3939
with:
4040
name: sentry-java
4141
fail_ci_if_error: false

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ jobs:
3434
java-version: '17'
3535

3636
- name: Setup Gradle
37-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
37+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
3838
with:
3939
gradle-home-cache-cleanup: true
4040

4141
- name: Initialize CodeQL
42-
uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # pin@v2
42+
uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2
4343
with:
4444
languages: ${{ matrix.language }}
4545

@@ -48,4 +48,4 @@ jobs:
4848
./gradlew buildForCodeQL
4949
5050
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # pin@v2
51+
uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # pin@v2

.github/workflows/enforce-license-compliance.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Setup Gradle
14-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
14+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
1515
with:
1616
gradle-home-cache-cleanup: true
1717

.github/workflows/generate-javadocs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ jobs:
2020
java-version: '17'
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
23+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
2424
with:
2525
gradle-home-cache-cleanup: true
2626

2727
- name: Generate Aggregate Javadocs
2828
run: |
2929
./gradlew aggregateJavadocs
3030
- name: Deploy
31-
uses: JamesIves/github-pages-deploy-action@62fec3add6773ec5dbbf18d2ee4260911aa35cf4 # pin@4.6.9
31+
uses: JamesIves/github-pages-deploy-action@15de0f09300eea763baee31dff6c6184995c5f6a # pin@4.7.2
3232
with:
3333
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3434
BRANCH: gh-pages

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
java-version: '17'
3838

3939
- name: Setup Gradle
40-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
40+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
4141
with:
4242
gradle-home-cache-cleanup: true
4343

@@ -86,7 +86,7 @@ jobs:
8686
java-version: '17'
8787

8888
- name: Setup Gradle
89-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
89+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
9090
with:
9191
gradle-home-cache-cleanup: true
9292

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
java-version: '17'
3333

3434
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
35+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
3636
with:
3737
gradle-home-cache-cleanup: true
3838

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
java-version: '17'
3333

3434
- name: Setup Gradle
35-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
35+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
3636
with:
3737
gradle-home-cache-cleanup: true
3838

.github/workflows/release-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
java-version: '17'
2727

2828
- name: Setup Gradle
29-
uses: gradle/actions/setup-gradle@4ba34e96c5f6493e99d0696180a9a8d431577ba9 # pin@v3
29+
uses: gradle/actions/setup-gradle@3839b20885c2c3507be5f0521853826f4b37038a # pin@v3
3030
with:
3131
gradle-home-cache-cleanup: true
3232

.github/workflows/release.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,22 @@ jobs:
1717
runs-on: ubuntu-latest
1818
name: "Release a new version"
1919
steps:
20+
- name: Get auth token
21+
id: token
22+
uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
23+
with:
24+
app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
25+
private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
2026
- uses: actions/checkout@v4
2127
with:
22-
token: ${{ secrets.GH_RELEASE_PAT }}
28+
token: ${{ steps.token.outputs.token }}
2329
# Needs to be set, otherwise git describe --tags will fail with: No names found, cannot describe anything
2430
fetch-depth: 0
2531
submodules: 'recursive'
2632
- name: Prepare release
2733
uses: getsentry/action-prepare-release@v1
2834
env:
29-
GITHUB_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
35+
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
3036
with:
3137
version: ${{ github.event.inputs.version }}
3238
force: ${{ github.event.inputs.force }}

0 commit comments

Comments
 (0)