Merge branch 'lllyasviel:main' into main

metercai · May 28, 2024 · ca30d1d · ca30d1d
2 parents e4052d2 + 725bf05
commit ca30d1d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/build_container.yml b/.github/workflows/build_container.yml
@@ -1,9 +1,11 @@
-name: Create and publish a container image
+name: Docker image build
 
 on:
   push:
+    branches:
+      - main
     tags:
-      - 'v*'
+      - v*
 
 jobs:
   build-and-push-image:
@@ -33,6 +35,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=edge,branch=main
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5

diff --git a/fooocus_version.py b/fooocus_version.py
@@ -1 +1 @@
-version = '2.4.0'
+version = '2.4.1'
diff --git a/javascript/localization.js b/javascript/localization.js
@@ -81,9 +81,12 @@ function refresh_style_localization() {
 }
 
 function refresh_aspect_ratios_label(value) {
-    label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]')
-    translation = getTranslation("Aspect Ratios")
-    label.textContent = translation + " " + htmlDecode(value)
+    label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]');
+    translation = getTranslation("Aspect Ratios");
+    if (typeof translation == "undefined") {
+        translation = "Aspect Ratios";
+    }
+    label.textContent = translation + " " + htmlDecode(value);
 }
 
 function localizeWholePage() {

diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,8 @@
+# [2.4.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.1)
+
+* Fix some small bugs (e.g. adjust clip skip default value from 1 to 2, add type check to aspect ratios js update function)
+* Add automated docker build on push to main, tagged with `edge`. See [available docker images](https://github.com/lllyasviel/Fooocus/pkgs/container/fooocus).
+
 # [2.4.0](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.0)
 
 * Change settings tab elements to be more compact