From 52b81cfcdc583a97ecc21b8c92e66979dd7cee87 Mon Sep 17 00:00:00 2001 From: weyu <985695055@qq.com> Date: Tue, 22 Apr 2025 15:50:01 +0800 Subject: [PATCH] cni1 --- .github/workflows/_push.yml | 2 +- webs/cni/toto.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/_push.yml b/.github/workflows/_push.yml index 2c31aad..d77109b 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/containerd/containerd.io.git + /bin/bash build.sh https://github.com/containernetworking/cni.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/cni/toto.sh b/webs/cni/toto.sh index 4addfd1..994dddd 100644 --- a/webs/cni/toto.sh +++ b/webs/cni/toto.sh @@ -1,5 +1,3 @@ -workdir=$1 - source libs/common.sh before_build(){ @@ -40,11 +38,11 @@ save_return(){ log_error "站点构建失败" fi - echo "${workdir}/${tarfile}" > ${workdir}/ret-data + echo "project_dir/${tarfile}" > ret-data } -cd $workdir +cd project_dir if cat .git/config |grep '/containernetworking/cni.dev.git' ;then echo "=============================================> 匹配到 cni" before_build