mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
ci(nix): remove addtional >
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
parent
c54f420c23
commit
7da32af1b2
1 changed files with 1 additions and 1 deletions
2
.github/actions/get-merge-commit/action.yml
vendored
2
.github/actions/get-merge-commit/action.yml
vendored
|
|
@ -98,6 +98,6 @@ runs:
|
||||||
if [[ "$mergeable" == "true" ]]; then
|
if [[ "$mergeable" == "true" ]]; then
|
||||||
echo "merge-commit-sha=$(jq -r .merge_commit_sha <<<"$prInfo")" >> "$GITHUB_OUTPUT"
|
echo "merge-commit-sha=$(jq -r .merge_commit_sha <<<"$prInfo")" >> "$GITHUB_OUTPUT"
|
||||||
else
|
else
|
||||||
echo "# 🚨 The PR has a merge conflict!" >>> "$GITHUB_STEP_SUMMARY"
|
echo "# 🚨 The PR has a merge conflict!" >> "$GITHUB_STEP_SUMMARY"
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue