Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OSOE-888: Fix that eps1lon/actions-label-merge-conflict uses outdated Node.js 16 #380

Merged
merged 4 commits into from
Jul 31, 2024
Merged

OSOE-888: Fix that eps1lon/actions-label-merge-conflict uses outdated Node.js 16 #380

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc7fca1
Updating eps1lon/actions-label-merge-conflict to v3.0.2
Piedone Jul 28, 2024
85533e7
Pointing GHA to issue branch
Piedone Jul 28, 2024
0880520
Merge remote-tracking branch 'origin/dev' into issue/OSOE-888
Piedone Jul 30, 2024
801e3dd
Update validate-pull-request.yml
sarahelsaig Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/check-merge-conflict/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ runs:
using: composite
steps:
- name: Check for merge conflict
# releases/2.1.0
uses: eps1lon/actions-label-merge-conflict@92924ba33a60e436034b0ac3838de523bf7df071
# v3.0.2
uses: eps1lon/actions-label-merge-conflict@1b1b1fcde06a9b3d089f3464c96417961dde1168
with:
repoToken: ${{ env.GITHUB_TOKEN }}
commentOnDirty: This pull request has merge conflicts. Please resolve those before requesting a review.
Expand Down
Loading