Skip to content

Commit

Permalink
Update update-upstream.yml
Browse files Browse the repository at this point in the history
Altered bash command chain to more github action steps
  • Loading branch information
Aadniz authored Oct 13, 2024
1 parent f87d002 commit 41cb65c
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion .github/workflows/update-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,16 @@ jobs:
- id: mergeUpstream
name: Merge upstream changes
# If the merging fails, we check if there is ONLY a conflict in the static css, and preceed if so
run: git merge upstream/master || ( ! git status | grep "both modified" | grep -q -v "searx/static/themes/simple/css" && make themes && ! grep -r "<<<<<<< HEAD" searx/static/themes/simple/css/ && git add searx/static/themes/simple/css/ && git commit -m "Compiled static" )
run: git merge upstream/master || ( ! git status | grep "both modified" | grep -q -v "searx/static/themes/simple/css" && echo "css_conflict=true" >> $GITHUB_ENV )

- id: compileTheme
name: Compile CSS theme
if: env.css_conflict == 'true'
run: |
make themes
! grep -r "<<<<<<< HEAD" searx/static/themes/simple/css/
git add searx/static/themes/simple/css/
git commit -m "Compiled static"
- id: pushChanges
name: Push changes
Expand Down

0 comments on commit 41cb65c

Please sign in to comment.