Skip to content

Commit 1b66dc4

Browse files
committed
Merge branch '3.1.x'
2 parents fd72798 + 99dd670 commit 1b66dc4

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

.github/workflows/composites/restore-docker-images/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ runs:
2929
uses: actions/cache/save@v4
3030
if: steps.images-cache.outputs.cache-hit != 'true'
3131
with:
32-
path: |
33-
/tmp/docker/images
32+
path: /tmp/docker/images
33+
key: docker-images-github-cache-${{ hashFiles('**/current-images.txt') }}
3434

3535
- name: print images
3636
shell: bash

.github/workflows/maven.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@ jobs:
4848
owner: context.repo.owner,
4949
repo: context.repo.repo,
5050
})
51-
for (const cache of caches.data.actions_caches) {
52-
console.log(cache)
53-
}
51+
console.log(caches.data)
5452
5553
- name: maven build with dry-run for tests
5654
uses: ./.github/workflows/composites/maven-build-with-dry-run-for-tests

spring-cloud-kubernetes-test-support/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<artifactId>spring-cloud-kubernetes-test-support</artifactId>
1313

1414
<properties>
15-
<awaitility.version>4.0.3</awaitility.version>
15+
<awaitility.version>4.1.1</awaitility.version>
1616
<testcontainers.version>1.18.3</testcontainers.version>
1717
</properties>
1818
<dependencies>

0 commit comments

Comments
 (0)