39406d0d42
This fixes several CI warnings like this one:
Node.js 16 actions are deprecated.
Please update the following actions to use Node.js 20: actions/checkout@v3,
actions/cache@v3, actions/upload-artifact@v3. For more information see:
https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update more GitHub actions from v3 to v4
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Change upload and download to work with v4
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update GitHub action eps1lon/actions-label-merge-conflict
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Update GitHub action nick-fields/retry
Signed-off-by: Stefan Weil <sw@weilnetz.de>
27 lines
667 B
YAML
27 lines
667 B
YAML
name: Merge conflict check
|
|
on:
|
|
push:
|
|
pull_request_target:
|
|
types:
|
|
- opened
|
|
- synchronize
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
jobs:
|
|
main:
|
|
permissions:
|
|
pull-requests: write # for eps1lon/actions-label-merge-conflict to label PRs
|
|
runs-on: ubuntu-latest
|
|
steps:
|
|
- name: Check for dirty pull requests
|
|
uses: eps1lon/actions-label-merge-conflict@v3
|
|
with:
|
|
dirtyLabel: "status: conflict"
|
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
|
commentOnDirty: |
|
|
This pull request has conflicts ☹
|
|
Please resolve those so we can review the pull request.
|
|
Thanks.
|