Skip to content

Commit c48e22d

Browse files
build(deps): bump actions/cache from 4 to 5 (#4997)
* build(deps): bump actions/cache from 4 to 5 Bumps [actions/cache](https://github.com/actions/cache) from 4 to 5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v4...v5) --- updated-dependencies: - dependency-name: actions/cache dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * Fix flaky test --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Roman Zavarnitsyn <[email protected]>
1 parent 2d05bb1 commit c48e22d

File tree

10 files changed

+11
-9
lines changed

10 files changed

+11
-9
lines changed

.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@v4
53+
uses: actions/cache@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@v4
34+
uses: actions/cache@v5
3535
with:
3636
path: buildSrc/build
3737
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

.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@v4
95+
- uses: actions/cache@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@v4
33+
uses: actions/cache@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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
sudo udevadm trigger --name-match=kvm
9191
9292
- name: AVD cache
93-
uses: actions/cache@v4
93+
uses: actions/cache@v5
9494
id: avd-cache
9595
with:
9696
path: |

.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@v4
53+
uses: actions/cache@v5
5454
with:
5555
path: buildSrc/build
5656
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

.github/workflows/spring-boot-3-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@v4
53+
uses: actions/cache@v5
5454
with:
5555
path: buildSrc/build
5656
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

.github/workflows/spring-boot-4-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@v4
53+
uses: actions/cache@v5
5454
with:
5555
path: buildSrc/build
5656
key: build-logic-${{ hashFiles('buildSrc/src/**', 'buildSrc/build.gradle.kts','buildSrc/settings.gradle.kts') }}

sentry-android-core/src/main/java/io/sentry/android/core/DefaultAndroidEventProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ final class DefaultAndroidEventProcessor implements EventProcessor {
3737

3838
private final @NotNull BuildInfoProvider buildInfoProvider;
3939
private final @NotNull SentryAndroidOptions options;
40-
private final @Nullable Future<DeviceInfoUtil> deviceInfoUtil;
40+
@TestOnly final @Nullable Future<DeviceInfoUtil> deviceInfoUtil;
4141
private final @NotNull LazyEvaluator<String> deviceFamily =
4242
new LazyEvaluator<>(() -> ContextUtils.getFamily(NoOpLogger.getInstance()));
4343

sentry-android-core/src/test/java/io/sentry/android/core/DefaultAndroidEventProcessorTest.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ class DefaultAndroidEventProcessorTest {
490490
@Test
491491
fun `Event sets no device cpu info when there is none provided`() {
492492
val sut = fixture.getSut(context)
493+
sut.deviceInfoUtil?.get()
493494
CpuInfoUtils.getInstance().setCpuMaxFrequencies(emptyList())
494495
assertNotNull(sut.process(SentryEvent(), Hint())) {
495496
val device = it.contexts.device!!
@@ -501,6 +502,7 @@ class DefaultAndroidEventProcessorTest {
501502
@Test
502503
fun `Event sets rights device cpu info when there is one provided`() {
503504
val sut = fixture.getSut(context)
505+
sut.deviceInfoUtil?.get()
504506
CpuInfoUtils.getInstance().setCpuMaxFrequencies(listOf(800, 900))
505507

506508
assertNotNull(sut.process(SentryEvent(), Hint())) {

0 commit comments

Comments
 (0)