diff --git a/.github/workflows/_push.yml b/.github/workflows/_push.yml index 242c8fe..ef10e19 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/grpc/grpc.io.git + /bin/bash build.sh https://github.com/goharbor/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/.github/workflows/harbor.yml b/.github/workflows/harbor.yml index 9e1aff2..4bcab1e 100644 --- a/.github/workflows/harbor.yml +++ b/.github/workflows/harbor.yml @@ -10,31 +10,6 @@ jobs: - uses: actions/checkout@v4 - name: Harbor 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/goharbor/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/goharbor/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/harbor/toto.sh b/webs/harbor/toto.sh index edf9638..7992652 100644 --- a/webs/harbor/toto.sh +++ b/webs/harbor/toto.sh @@ -1,9 +1,6 @@ -workdir=$1 -initdir=$2 - source libs/common.sh -before_harbor_website(){ +before_build(){ make prepare npm i @@ -16,7 +13,7 @@ before_harbor_website(){ } -after_harbor_website(){ +build(){ #npm run build:production @@ -29,21 +26,35 @@ after_harbor_website(){ --minify \ --gc \ --enableGitInfo \ - --baseURL https://harbor.cncfstack.com + --baseURL https://harbor.website.cncfstack.com } save_return(){ - ls -lha - echo "${workdir}/output&oss://cncfstack-harbor" > ${workdir}/ret-data + #echo "${workdir}/output&oss://cncfstack-harbor" > ${workdir}/ret-data + # 这行很重要,在其他关联项目中,文件名称必须要匹配 + tarfile="harbor.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 '/goharbor/website.git' ;then - echo "=============================================> 匹配到 harbor" - before_harbor_website - after_harbor_website + echo "匹配到 harbor" + before_build + build find_and_sed_v2 "./output" save_return fi