From 90bda38d4048dace9c1984868ec593b58e8d345a Mon Sep 17 00:00:00 2001 From: weyu <985695055@qq.com> Date: Tue, 22 Apr 2025 17:06:32 +0800 Subject: [PATCH] falco --- .github/workflows/_push.yml | 2 +- webs/falco/toto.sh | 38 +++++++++++++++++++++++++------------ 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.github/workflows/_push.yml b/.github/workflows/_push.yml index c4f9491..f286505 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/etcd-io/website.git + /bin/bash build.sh https://github.com/falcosecurity/falco-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/falco/toto.sh b/webs/falco/toto.sh index 18ebc68..23dd1f1 100644 --- a/webs/falco/toto.sh +++ b/webs/falco/toto.sh @@ -1,9 +1,6 @@ -workdir=$1 -initdir=$2 - source libs/common.sh -before_falco_website(){ +before_build(){ install_hugo_v108 install_postcss make dependencies @@ -13,10 +10,11 @@ before_falco_website(){ } -after_falco_website(){ +build(){ #npm run build:production + log_info "开始进行网站构建" mkdir output hugo \ --destination ./output \ @@ -24,21 +22,37 @@ after_falco_website(){ --minify \ --gc \ --enableGitInfo \ - --baseURL https://falco.cncfstack.com + --baseURL https://falco.website.cncfstack.com } save_return(){ - ls -lha - echo "${workdir}/output&oss://cncfstack-falco" > ${workdir}/ret-data + # ls -lha + # echo "${workdir}/output&oss://cncfstack-falco" > ${workdir}/ret-data + + # 这行很重要,在其他关联项目中,文件名称必须要匹配 + tarfile="falco.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 '/falcosecurity/falco-website.git' ;then - echo "=============================================> 匹配到 falco" - before_falco_website - after_falco_website + echo "匹配到 falco" + before_build + build find_and_sed_v2 "./output" save_return fi