Skip to content

Commit 7b4a176

Browse files
lbloderlbloder
committed
Merge branch 'main' into fix/spring-urls
2 parents 0c476a3 + d8b6ce1 commit 7b4a176

223 files changed

Lines changed: 5633 additions & 1605 deletions

File tree

Some content is hidden

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

‎.github/workflows/agp-matrix.yml‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,18 @@ jobs:
2828

2929
steps:
3030
- name: Checkout Repo
31-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
31+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3232
with:
3333
submodules: 'recursive'
3434

3535
- name: Setup Java Version
36-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
36+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
3737
with:
3838
distribution: 'temurin'
3939
java-version: '17'
4040

4141
- name: Setup Gradle
42-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
42+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
4343
with:
4444
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4545

@@ -50,7 +50,7 @@ jobs:
5050
sudo udevadm trigger --name-match=kvm
5151
5252
- name: AVD cache
53-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
53+
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
5454
id: avd-cache
5555
with:
5656
path: |
@@ -112,10 +112,3 @@ jobs:
112112
reporter: java-junit
113113
output-to: step-summary
114114
fail-on-error: false
115-
116-
- name: Upload test results to Codecov
117-
if: ${{ !cancelled() }}
118-
uses: codecov/test-results-action@0fa95f0e1eeaafde2c782583b36b28ad0d8c77d3
119-
with:
120-
token: ${{ secrets.CODECOV_TOKEN }}
121-
file: build/outputs/androidTest-results/**/*.xml

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,38 @@ jobs:
1919

2020
steps:
2121
- name: Checkout Repo
22-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2323
with:
2424
ref: ${{ github.event.pull_request.head.sha || github.sha }}
2525
submodules: 'recursive'
2626

2727
- name: Setup Java Version
28-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
28+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
2929
with:
3030
distribution: 'temurin'
3131
java-version: '17'
3232

3333
# Workaround for https://github.com/gradle/actions/issues/21 to use config cache
3434
- name: Cache buildSrc
35-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
35+
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
3636
with:
3737
path: buildSrc/build
3838
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
41+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
4242
with:
4343
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4444

45-
- name: Run Tests with coverage and Lint
45+
- name: Run Tests and Lint
4646
run: make preMerge
4747

4848
- name: Install Sentry CLI
4949
run: curl -sL https://sentry.io/get-cli/ | bash
5050

5151
- name: Upload Snapshots to Sentry
52+
# Skip on PRs from forks, which don't have access to the upload secret
53+
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository }}
5254
run: |
5355
sentry-cli build snapshots ./sentry-android-core/build/test-snapshots \
5456
--app-id sentry-android-core
@@ -57,13 +59,6 @@ jobs:
5759
SENTRY_ORG: sentry-sdks
5860
SENTRY_PROJECT: sentry-android
5961

60-
- name: Upload coverage to Codecov
61-
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # pin@v4
62-
with:
63-
name: sentry-java
64-
fail_ci_if_error: false
65-
token: ${{ secrets.CODECOV_TOKEN }}
66-
6762
- name: Upload test results
6863
if: always()
6964
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7

‎.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@acdb88019720182caf57293360d7cdc8db9e75ac # v2
18+
uses: getsentry/craft/.github/workflows/changelog-preview.yml@9312e4dfc82e545ef0cad911c23f430fe5f52673 # v2
1919
secrets: inherit

‎.github/workflows/changes-in-high-risk-code.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
high_risk_code: ${{ steps.changes.outputs.high_risk_code }}
1717
high_risk_code_files: ${{ steps.changes.outputs.high_risk_code_files }}
1818
steps:
19-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
19+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2020
- name: Get changed files
2121
id: changes
2222
uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1

‎.github/workflows/check-tombstone-proto-schema.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
13+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1414

1515
- name: Check for newer Tombstone proto schema
1616
run: ./scripts/check-tombstone-proto-schema.sh

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020

2121
steps:
2222
- name: Checkout Repo
23-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
23+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2424
with:
2525
submodules: 'recursive'
2626

2727
- name: Setup Java Version
28-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
28+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
2929
with:
3030
distribution: 'temurin'
3131
java-version: '17'
3232

3333
- name: Setup Gradle
34-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
34+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
3535
with:
3636
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
3737

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Setup Gradle
14-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
14+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
1515

1616
- name: Set up Java
17-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
17+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
1818
with:
1919
distribution: 'temurin'
2020
java-version: '17'
2121

2222
- name: Checkout
23-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
23+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
2424

2525
# TODO: remove this when upstream is fixed
2626
- name: Disable Gradle configuration cache (see https://github.com/fossas/fossa-cli/issues/872)

‎.github/workflows/format-code.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
11+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1212
with:
1313
submodules: 'recursive'
1414

1515
- name: set up JDK 17
16-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
16+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
1717
with:
1818
distribution: 'temurin'
1919
java-version: '17'
2020

2121
- name: Setup Gradle
22-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
22+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
2323
with:
2424
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
2525

‎.github/workflows/generate-javadocs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout 🛎️
12-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
12+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1313
with:
1414
submodules: 'recursive'
1515

1616
- name: set up JDK 17
17-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
17+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
1818
with:
1919
distribution: 'temurin'
2020
java-version: '17'
2121

2222
- name: Setup Gradle
23-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
23+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
2424

2525
- name: Generate Aggregate Javadocs
2626
run: |

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ jobs:
2727

2828
steps:
2929
- name: Git checkout
30-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
30+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3131
with:
3232
submodules: 'recursive'
3333

3434
- name: 'Set up Java: 17'
35-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
35+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
3636
with:
3737
distribution: 'temurin'
3838
java-version: '17'
3939

4040
- name: Setup Gradle
41-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
41+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
4242
with:
4343
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
4444

@@ -77,22 +77,22 @@ jobs:
7777

7878
steps:
7979
- name: Git checkout
80-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
80+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8181
with:
8282
submodules: 'recursive'
8383

8484
- name: 'Set up Java: 17'
85-
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
85+
uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5
8686
with:
8787
distribution: 'temurin'
8888
java-version: '17'
8989

9090
- name: Setup Gradle
91-
uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
91+
uses: gradle/actions/setup-gradle@3f131e8634966bd73d06cc69884922b02e6faf92 # v6.2.0
9292
with:
9393
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
9494

95-
- uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
95+
- uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6.0.0
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

0 commit comments

Comments
 (0)