From af210b5f069de5f76f80f32be21cc4b9479eb8af Mon Sep 17 00:00:00 2001
From: weyu <985695055@qq.com>
Date: Tue, 22 Apr 2025 16:29:58 +0800
Subject: [PATCH] emissary-ingress

---
 .github/workflows/_push.yml            |  2 +-
 .github/workflows/emissary-ingress.yml | 31 +++------------------
 webs/emissary-ingress/toto.sh          | 37 +++++++++++++++++---------
 3 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/_push.yml b/.github/workflows/_push.yml
index 23e60af..256321c 100644
--- a/.github/workflows/_push.yml
+++ b/.github/workflows/_push.yml
@@ -10,6 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Push To-To-To
         run:  |
-          /bin/bash build.sh https://github.com/dragonflyoss/d7y.io.git
+          /bin/bash build.sh https://github.com/emissary-ingress/emissary-ingress.dev.git
           src=`cat project_dir/ret-data|grep -v ^$|head -n 1`
           ./ossutil --access-key-id ${{ secrets.ALIYUN_CYG_OSS_AK }}  --access-key-secret ${{ secrets.ALIYUN_CYG_OSS_SK }}  --endpoint ${{ secrets.ALIYUN_CYG_OSS_ENDPOINT }} --region ${{ secrets.ALIYUN_CYG_OSS_REGION }}  cp -f ${src} oss://cncfstack-website/
\ No newline at end of file
diff --git a/.github/workflows/emissary-ingress.yml b/.github/workflows/emissary-ingress.yml
index 4bb9dca..4af5565 100644
--- a/.github/workflows/emissary-ingress.yml
+++ b/.github/workflows/emissary-ingress.yml
@@ -10,31 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - name:  Emissary-Ingress To-To-To
         run: |
-          set -x
-
-          source libs/common.sh
-          install_aliyun_ossutil
-          
-          initdir=`pwd`
-
-          
-
-          cat ${initdir}/sed/* > ${initdir}/toto.sed
-
-          for project in "https://github.com/emissary-ingress/emissary-ingress.dev.git"
-          do
-
-              uuid=`date  "+%s%N"`
-              workdir="${initdir}/tmp/${uuid}"
-              mkdir -p $workdir
-
-              git clone $project $workdir
-               ls $workdir
-
-              find ./webs -name toto.sh -exec /bin/bash {} $workdir $initdir \;
-
-              src=`cat ${workdir}/ret-data|grep -v ^$|head -n 1|awk -F'&' '{print $1}'`
-              dest=`cat ${workdir}/ret-data|grep -v ^$|head -n 1|awk -F'&' '{print $2}'`
-
-              ./ossutil --access-key-id ${{ secrets.ALIYUN_CYG_OSS_AK }}  --access-key-secret ${{ secrets.ALIYUN_CYG_OSS_SK }}  --endpoint ${{ secrets.ALIYUN_CYG_OSS_ENDPOINT }} --region ${{ secrets.ALIYUN_CYG_OSS_REGION }}  cp -fr $src $dest
-          done
\ No newline at end of file
+          /bin/bash build.sh https://github.com/emissary-ingress/emissary-ingress.dev.git
+          src=`cat project_dir/ret-data|grep -v ^$|head -n 1`
+          ./ossutil --access-key-id ${{ secrets.ALIYUN_CYG_OSS_AK }}  --access-key-secret ${{ secrets.ALIYUN_CYG_OSS_SK }}  --endpoint ${{ secrets.ALIYUN_CYG_OSS_ENDPOINT }} --region ${{ secrets.ALIYUN_CYG_OSS_REGION }}  cp -f ${src} oss://cncfstack-website/
\ No newline at end of file
diff --git a/webs/emissary-ingress/toto.sh b/webs/emissary-ingress/toto.sh
index d067005..04e5a08 100644
--- a/webs/emissary-ingress/toto.sh
+++ b/webs/emissary-ingress/toto.sh
@@ -1,9 +1,6 @@
-workdir=$1
-initdir=$2
-
 source libs/common.sh
 
-before_emissary-ingress_website(){
+before_build(){
     install_hugo_v145
 
     npm install
@@ -17,7 +14,7 @@ before_emissary-ingress_website(){
 
 }
 
-after_emissary-ingress_website(){
+build(){
 
     mkdir output
     hugo \
@@ -31,17 +28,33 @@ after_emissary-ingress_website(){
 }
 
 save_return(){
-    ls -lha
-    pwd
-    echo "${workdir}/output&oss://cncfstack-emissary-ingress" > ${workdir}/ret-data
+    # ls -lha
+    # pwd
+    # echo "${workdir}/output&oss://cncfstack-emissary-ingress" > ${workdir}/ret-data
+
+    # 这行很重要，在其他关联项目中，文件名称必须要匹配
+    tarfile="emissary-ingress.tgz"
+
+    # 进入到site目录后进行打包，这样是为了便于部署时解压
+    tar -czf ${tarfile} -C output .
+
+    if [ ! -s ${tarfile} ];then
+        log_error "站点构建失败"
+    fi
+
+    debug_tools
+    
+    log_info "站点构建完成"
+
+    echo "project_dir/${tarfile}" > ret-data
 }
 
 
-cd $workdir
+cd project_dir
 if cat .git/config  |grep '/emissary-ingress/emissary-ingress.dev.git' ;then
-    echo "=============================================> 匹配到 emissary-ingress"
-    before_emissary-ingress_website
-    after_emissary-ingress_website
+    echo "匹配到 emissary-ingress"
+    before_build
+    build
     find_and_sed_v2 "./output"
     save_return 
 fi