From 84472dc791f24ec394771e4e7e3b41754a351519 Mon Sep 17 00:00:00 2001
From: sam <huapox@126.com>
Date: Sun, 15 Oct 2023 15:37:55 +0800
Subject: [PATCH] gitac up

gitac feat/ubt-armv7

gitac: sh buildx.sh compile2

gitac: sh buildx.sh #core

gitac: compile

gitac: compile2

gitac: core

gitac up

gitac: core

# branches: [ "dev", "feat/ubt-armv7" ]

gitac: sh buildx.sh compile2

gitac: branches: [ "dev", "feat/ubt-armv7" ]

gitac: sh buildx.sh #core
---
 .github/workflows/docker-image.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 6b1b68a..9e1f7ec 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,7 +1,8 @@
 name: docker-image
 on:
   push:
-    branches: [ "dev" ]
+    # branches: [ "dev" ]
+    branches: [ "dev", "feat/ubt-armv7" ]
   pull_request:
     branches: [ "dev" ]
 jobs:
@@ -63,12 +64,14 @@ jobs:
           # BUILD
           echo core; cd ubt-core; 
             # sh buildx.sh compile
+            # sh buildx.sh compile2
+            # 
             # sh buildx.sh slim; sh buildx.sh base
             sh buildx.sh #core
-          #HEADLESS's merge
-          if [ "infrastlabs/docker-headless" == "${{ github.repository }}" ]; then
-            echo custom; cd ../ubt-custom; sh buildx.sh; #sh buildx.sh sogou; 
-            echo desktop; cd ../ubt-desktop; 
-              sh buildx.sh; sh buildx.sh plasma; 
-              sh buildx.sh cxfce; sh buildx.sh cinna; #sh buildx.sh cmate; 
-          fi
+          # #HEADLESS's merge
+          # if [ "infrastlabs/docker-headless" == "${{ github.repository }}" ]; then
+          #   echo custom; cd ../ubt-custom; sh buildx.sh; #sh buildx.sh sogou; 
+          #   echo desktop; cd ../ubt-desktop; 
+          #     sh buildx.sh; sh buildx.sh plasma; 
+          #     sh buildx.sh cxfce; sh buildx.sh cinna; #sh buildx.sh cmate; 
+          # fi