Skip to content

Commit d71aee2

Browse files
dependabot[bot]mergify[bot]
authored andcommitted
Bump actions/checkout from 4 to 5
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@v4...v5) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '5' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> (cherry picked from commit 534f3f8) # Conflicts: # .github/workflows/test-make-target.yaml
1 parent f04191b commit d71aee2

File tree

1 file changed

+13
-0
lines changed

1 file changed

+13
-0
lines changed

.github/workflows/test-make-target.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,19 @@ jobs:
5454
# restricted to the build jobs to avoid duplication in output.
5555
disable_problem_matchers: true
5656

57+
<<<<<<< HEAD
58+
=======
59+
# We install Erlang problem matchers from ci.erlang.mk.
60+
- name: CHECKOUT ERLANG PROBLEM MATCHERS
61+
uses: actions/checkout@v5
62+
with:
63+
repository: ninenines/ci.erlang.mk
64+
path: ci.erlang.mk
65+
66+
- name: INSTALL ERLANG PROBLEM MATCHERS
67+
run: echo "::add-matcher::ci.erlang.mk/.github/matchers/erlang-matchers.json"
68+
69+
>>>>>>> 534f3f812 (Bump actions/checkout from 4 to 5)
5770
- name: MIXED CLUSTERS - FETCH SIGNING KEYS
5871
uses: dsaltares/fetch-gh-release-asset@master
5972
if: inputs.mixed_clusters

0 commit comments

Comments
 (0)