Skip to content

Commit 77bee10

Browse files
authored
Merge pull request #2040 from pi-hole/dependabot/github_actions/development/github_action-dependencies-4c2dd54c96
build(deps): Bump the github_action-dependencies group across 1 directory with 3 updates
2 parents dc86ea3 + c06cb2b commit 77bee10

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/build-and-publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd #v6.0.2
3737

3838
- name: Set up QEMU
39-
uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a #v4.0.0
39+
uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 #v4.1.0
4040

4141
- name: Test
4242
run: CIPLATFORM=${{ env.CI_ARCH }} bash test/run.sh
@@ -50,7 +50,7 @@ jobs:
5050
- run: echo "Exposing env vars for reusable workflow"
5151

5252
build:
53-
uses: docker/github-builder/.github/workflows/build.yml@073833262a23a17675c95c4541ab063b7646756b #v1.9.0
53+
uses: docker/github-builder/.github/workflows/build.yml@17bd7d64200cae4ba58ffc099934e8012ae320f2 #v1.10.0
5454
needs:
5555
- build-prepare
5656
permissions:

.github/workflows/merge-conflict.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Check if PRs are have merge conflicts
20-
uses: eps1lon/actions-label-merge-conflict@1df065ebe6e3310545d4f4c4e862e43bdca146f0 #v3.0.3
20+
uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 #v3.1.0
2121
with:
2222
dirtyLabel: "Merge Conflict"
2323
repoToken: "${{ secrets.GITHUB_TOKEN }}"

0 commit comments

Comments
 (0)