diff --git a/.github/workflows/karmada.yml b/.github/workflows/karmada.yml index 5c9cae1..7a15a51 100644 --- a/.github/workflows/karmada.yml +++ b/.github/workflows/karmada.yml @@ -10,31 +10,6 @@ jobs: - uses: actions/checkout@v4 - name: Karmada 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/karmada-io/website.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/karmada-io/website.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/karmada/toto.sh b/webs/karmada/toto.sh index 17aa187..85c9863 100644 --- a/webs/karmada/toto.sh +++ b/webs/karmada/toto.sh @@ -1,15 +1,12 @@ -workdir=$1 -initdir=$2 - source libs/common.sh -before_karmada(){ +before_build(){ npm install sed -i "s|plugins:\s*\[|plugins: [()=>({name:'umami-analytics',injectHtmlTags:()=>({headTags:[{tagName:'script',attributes:{defer:true,src:'https://umami.cncfstack.com/script.js','data-website-id':'77375498-62d6-417f-ba87-4945bfe9b001'}}]})}),|g" docusaurus.config.js cat ./docusaurus.config.js } -after_karmada(){ +build(){ echo "npm build-----" npm run build @@ -17,17 +14,31 @@ after_karmada(){ } save_return(){ - echo "${workdir}/build&oss://cncfstack-karmada" > ${workdir}/ret-data + # echo "${workdir}/build&oss://cncfstack-karmada" > ${workdir}/ret-data + # 这行很重要,在其他关联项目中,文件名称必须要匹配 + tarfile="karmada.tgz" + + # 进入到site目录后进行打包,这样是为了便于部署时解压 + tar -czf ${tarfile} -C build . + + 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 '/karmada-io/website.git' ;then - echo "=============================================> 匹配到 karmada" - before_karmada + echo "匹配到 karmada" + before_build find_and_sed - after_karmada + build save_return fi