修复build action

This commit is contained in:
hanhh 2021-05-20 15:12:54 +08:00
parent a6c2a99c14
commit 177150cb75
2 changed files with 8 additions and 8 deletions

View File

@ -23,12 +23,11 @@ jobs:
env: env:
GITHUB_REPO: gitee.com/whyour/qinglong-static GITHUB_REPO: gitee.com/whyour/qinglong-static
run: | run: |
git config --global user.email "imwhyour@gmail.com" mkdir -p static
git config --global user.name "whyour"
git clone --depth 1 https://gitee.com/whyour/qinglong-static.git static
cd ./static cd ./static
rm -rf dist/* && rm -rf build/*
cp -rf ../dist ./ && cp -rf ../build ./ cp -rf ../dist ./ && cp -rf ../build ./
git add . git init && git add .
git config user.name "whyour"
git config user.email "imwhyour@gmail.com"
git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')" git commit --allow-empty -m "copy static at $(date +'%Y-%m-%d %H:%M:%S')"
git push --quiet "https://whyour:${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" master:master git push --force --quiet "https://whyour:${{ secrets.API_TOKEN }}@${GITHUB_REPO}.git" master

View File

@ -166,7 +166,8 @@ update_repo() {
local repo_path="${dir_repo}/${author}_${repo}" local repo_path="${dir_repo}/${author}_${repo}"
if [ -d ${repo_path}/.git ]; then if [ -d ${repo_path}/.git ]; then
reset_romote_url ${repo_path} ${url} reset_romote_url ${repo_path} ${url}
git_pull_scripts ${repo_path} git fetch
git reset --hard origin/master >/dev/null 2>&1
else else
git_clone_scripts ${url} ${repo_path} git_clone_scripts ${url} ${repo_path}
fi fi
@ -253,7 +254,7 @@ update_qinglong() {
cp -f $file_config_sample $dir_config/config.sample.sh cp -f $file_config_sample $dir_config/config.sample.sh
detect_config_version detect_config_version
update_depend update_depend
[ -f $dir_root/package.json ] && ql_depend_new=$(cat $dir_root/package.json) [ -f $dir_root/package.json ] && ql_depend_new=$(cat $dir_root/package.json)
[[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root [[ "$ql_depend_old" != "$ql_depend_new" ]] && npm_install_2 $dir_root
else else