From 41cb65c6e82d7058754026dfc0bd9d96bdc5c490 Mon Sep 17 00:00:00 2001
From: Aadniz <8147434+Aadniz@users.noreply.github.com>
Date: Sun, 13 Oct 2024 20:44:25 +0200
Subject: [PATCH] Update update-upstream.yml

Altered bash command chain to more github action steps
---
 .github/workflows/update-upstream.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/update-upstream.yml b/.github/workflows/update-upstream.yml
index 2e87c1ef576..ad5cbdae42f 100644
--- a/.github/workflows/update-upstream.yml
+++ b/.github/workflows/update-upstream.yml
@@ -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