From ec4414ae54dc28d1ebd60256975d4c4981843f9f Mon Sep 17 00:00:00 2001
From: weyu <985695055@qq.com>
Date: Tue, 22 Apr 2025 15:53:52 +0800
Subject: [PATCH] cloudevents2

---
 .github/workflows/_push.yml       |  2 +-
 .github/workflows/cloudevents.yml | 31 +++----------------------------
 webs/cloudevents/toto.sh          | 15 +++++----------
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/_push.yml b/.github/workflows/_push.yml
index d77109b..bc6feb0 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/containernetworking/cni.dev.git
+          /bin/bash build.sh https://github.com/cloudevents/cloudevents-web.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/cloudevents.yml b/.github/workflows/cloudevents.yml
index 16992d6..7ce7e71 100644
--- a/.github/workflows/cloudevents.yml
+++ b/.github/workflows/cloudevents.yml
@@ -10,31 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - name:  CloudEvents 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/cloudevents/cloudevents-web.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/cloudevents/cloudevents-web.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/cloudevents/toto.sh b/webs/cloudevents/toto.sh
index 7a6aa57..845b354 100644
--- a/webs/cloudevents/toto.sh
+++ b/webs/cloudevents/toto.sh
@@ -1,9 +1,5 @@
-workdir=$1
-initdir=$2
-
 source libs/common.sh
 
-
 before_build(){
  
     install_hugo_v120
@@ -42,7 +38,7 @@ save_return(){
     tarfile="cloudevents.tgz"
 
     # 进入到site目录后进行打包，这样是为了便于部署时解压
-    tar -czf ${tarfile} -C ${workdir}/website-site .
+    tar -czf ${tarfile} -C website-site .
 
     if [ ! -s ${tarfile} ];then
         log_error "站点构建失败"
@@ -52,16 +48,15 @@ save_return(){
     
     log_info "站点构建完成"
 
-    echo "${workdir}/${tarfile}" > ${workdir}/ret-data
+    echo "project_dir/${tarfile}" > ret-data
 }
 
 
-cd $workdir
-
+cd project_dir
 if cat .git/config  |grep '/cloudevents/cloudevents-web.git' ;then
-    echo "=============================================> 匹配到 cloudevents"
+    echo "匹配到 cloudevents"
     before_build
-    find_and_sed
+    find_and_sed_v2 website-site
     build
     save_return 
 fi
\ No newline at end of file