diff --git a/.github/workflows/blank.yml b/.github/workflows/blank.yml index 3b0fbbe..bc118dc 100644 --- a/.github/workflows/blank.yml +++ b/.github/workflows/blank.yml @@ -34,6 +34,8 @@ jobs: initdir=`pwd` + source ${initdir}/libs/common.sh + for project in `cat push.list` do @@ -45,10 +47,8 @@ jobs: git clone $project $workdir ls $workdir - find ./webs -name toto.sh -exec bash -x {} $workdir $initdir \; + find ./webs -name toto.sh -exec source {} \; - # ret="build-output-dirpash&remote_oss_path" - #ret=`toto.sh $project` 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}'` diff --git a/webs/helm/toto.sh b/webs/helm/toto.sh index 35104eb..9568671 100644 --- a/webs/helm/toto.sh +++ b/webs/helm/toto.sh @@ -1,9 +1,8 @@ -#!/bin/bash -workdir=$1 -initdir=$2 +#workdir=$1 +#initdir=$2 -source ${initdir}/libs/common.sh +#source ${initdir}/libs/common.sh before_helm_website(){ echo "install hugo" @@ -50,4 +49,3 @@ if cat .git/config |grep '/helm/helm-www.git' ;then after_helm_website save_return fi -cd -