Skip to content

Commit d78f9b6

Browse files
authored
Merge branch 'master' into renovate/docker-setup-buildx-action-3.x
2 parents 6d01052 + 2070632 commit d78f9b6

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/renovate.json5

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
extends: ["local>SpotOnInc/renovate-config"],
44
// To make happy 'Validate PR title' GHA
55
commitMessageLowerCase: "never",
6+
// Disable auto-rebase on every commit to avoid reaching Github limits on macos runners
7+
rebaseWhen: "conflicted",
68
}

.github/workflows/build-image-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Set up QEMU
3636
if: matrix.os != 'ubuntu-latest' || matrix.arch != 'amd64'
3737
# yamllint disable-line rule:line-length
38-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
38+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
3939
with:
4040
platforms: arm64
4141

.github/workflows/build-image.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
1919
- name: Set up QEMU
2020
# yamllint disable-line rule:line-length
21-
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
21+
uses: docker/setup-qemu-action@53851d14592bedcffcf25ea515637cff71ef929a # v3.3.0
2222
- name: Set up Docker Buildx
2323
# yamllint disable-line rule:line-length
2424
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0

0 commit comments

Comments
 (0)