containerd2

.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/coredns/coredns.io.git
+          /bin/bash build.sh https://github.com/containerd/containerd.io.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/

.github/workflows/containerd.yml

@@ -10,42 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - name:  Containerd To-To-To
         run: |
-          set -x
+          /bin/bash build.sh https://github.com/containerd/containerd.io.git
-
+          src=`cat project_dir/ret-data|grep -v ^$|head -n 1`
-          source libs/common.sh
+          ./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/
-          install_aliyun_ossutil
-          
-          initdir=`pwd`
-
-          
-
-          cat ${initdir}/sed/* > ${initdir}/toto.sed
-
-          for project in "https://github.com/containerd/containerd.io.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}'`
-
-          
-              ls -lha $src
-
-              if [ -f "${src}/index.html" ];then
-                echo "=============================================>  构建成功，上传文件到OSS"
-                ./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
-              else
-                echo "=============================================>  没有构建出 index.html 文件"
-                continue
-              fi
-          
-          
-          done

.github/workflows/coredns.yml

@@ -10,42 +10,6 @@ jobs:
       - uses: actions/checkout@v4
       - name:  CoreDNS To-To-To
         run: |
-          set -x
+          /bin/bash build.sh https://github.com/coredns/coredns.io.git
-
+          src=`cat project_dir/ret-data|grep -v ^$|head -n 1`
-          source libs/common.sh
+          ./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/
-          install_aliyun_ossutil
-          
-          initdir=`pwd`
-
-          
-
-          cat ${initdir}/sed/* > ${initdir}/toto.sed
-
-          for project in "https://github.com/coredns/coredns.io.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}'`
-
-          
-              ls -lha $src
-
-              if [ -f "${src}/index.html" ];then
-                echo "=============================================>  构建成功，上传文件到OSS"
-                ./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
-              else
-                echo "=============================================>  没有构建出 index.html 文件"
-                continue
-              fi
-          
-          
-          done

webs/containerd/toto.sh

@@ -1,5 +1,3 @@
-workdir=$1
-
 source libs/common.sh
 
 before_build(){
@@ -8,16 +6,15 @@ before_build(){
     install_postcss
     npm install .
 
-
+    log_info "添加网站访问统计"
-    # 添加网站访问统计
     echo '<script defer src="https://umami.cncfstack.com/script.js" data-website-id="a93d1af2-4dc1-4b93-b844-141af6812cf5"></script>' >>  ./themes/containerd/layouts/partials/meta.html
-
 }
 
-after_containerd_website(){
+
+build(){
 
     #npm run build:production
-
+    log_info "开始构建站点"
     mkdir output
     hugo \
     --destination ./output \
@@ -42,16 +39,17 @@ save_return(){
     if [ ! -s ${tarfile} ];then
         log_error "站点构建失败"
     fi
+    log_info "站点构建完成"
+    echo "project_dir/${tarfile}" > project_dir/ret-data
 
-    echo "${workdir}/${tarfile}" > ${workdir}/ret-data
 }
 
 
-cd $workdir
+cd project_dir
 if cat .git/config  |grep '/containerd/containerd.io.git' ;then
     echo "=============================================> 匹配到 containerd"
     before_build
-    after_containerd_website
+    build
     find_and_sed_v2 "./output"
     save_return 
 fi

webs/coredns/toto.sh

@@ -13,7 +13,7 @@ build(){
 
     #npm run build:production
 
-    log_info "开售构建站点"
+    log_info "开始构建站点"
     mkdir output
     hugo \
     --destination ./output \