Skip to content

Commit

Permalink
Update update-upstream.yml
Browse files Browse the repository at this point in the history
Useful to actually see what conflicts could not be merged
  • Loading branch information
Aadniz authored Oct 17, 2024
1 parent 959e3d6 commit ebcef1d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/update-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: steps.mergeUpstream.outputs.merge_failed == 'true'
# Check if there is ONLY a conflict in the static css, and preceed if so
run: |
! git status | grep "both modified" | grep -q -v "searx/static/themes/simple/css" && echo "css_conflict=true" >> $GITHUB_OUTPUT
! git status | grep "both modified" | grep -v "searx/static/themes/simple/css" && echo "css_conflict=true" >> $GITHUB_OUTPUT
- id: compileTheme
name: Compile CSS theme
Expand Down

0 comments on commit ebcef1d

Please sign in to comment.