Merge branch 'dev' into revert-1644-renovate/rimraf-6.x

watchdogpolska · Dec 17, 2024 · f4fd51f · f4fd51f
2 parents 8ceeeb5 + 0403acc
commit f4fd51f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/regenerate_frontend.yml b/.github/workflows/regenerate_frontend.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Regenerate frontend with gulp service
       run: |
         docker compose -f docker-compose.yml run web python manage.py collectstatic --no-input
-        docker compose -f docker-compose.yml up --abort-on-container-exit --exit-code-from gulp
+        docker compose -f docker-compose.yml up --exit-code-from gulp
 
     - name: Check for Changes in Static Files and Commit to base branch if any
       env:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "gulp-clean-css": "^4.3.0",
     "gulp-notify": "^4.0.0",
     "gulp-rename": "^2.0.0",
-    "gulp-sass": "^6.0.0",
+    "gulp-sass": "^5.1.0",
     "sass": "^1.58.3",
     "gulp-uglify": "^3.0.2",
     "gulp-watch": "^5.0.1",