Skip to content

Commit

Permalink
Fix script
Browse files Browse the repository at this point in the history
  • Loading branch information
Arthri committed Jan 22, 2024
1 parent 318d581 commit 64627b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-tgui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ jobs:
-H "Accept: application/vnd.github+json" \
-H "X-GitHub-Api-Version: 2022-11-28" \
"https://api.github.com/repos/$REPOSITORY/compare/master...${{ inputs.branch }}")
behind_by=$(compare_result | jq '.behind_by')
ahead_by=$(compare_result | jq '.ahead_by')
if [ $behind_by -le 0 ] ; then
behind_by=$($compare_result | jq '.behind_by')
ahead_by=$($compare_result | jq '.ahead_by')
if [ "$behind_by" -le 0 ] ; then
echo '- Skipping master merge. No changes to merge.' | tee -a "$GITHUB_STEP_SUMMARY"
exit 0
else
Expand All @@ -73,7 +73,7 @@ jobs:
git fetch origin master --depth=$((behind_by + 1)) && { git merge FETCH_HEAD || true ; }
exit_code=0
merge_conflicts=$(git diff --name-only --diff-filter=U --exit-code) || exit_code=$?
if [ $exit_code -eq 0 ] ; then
if [ "$exit_code" -eq 0 ] ; then
exit 0
elif echo $merge_conflicts | grep -v ^tgui/public/ ; then
echo '- Automatic merge failed. Non-tgui bundle files have conflicts.' | tee -a "$GITHUB_STEP_SUMMARY"
Expand Down

0 comments on commit 64627b9

Please sign in to comment.