zheng/blog-frontEnd
1
0
Fork 0
Code Issues 2 Pull Requests 12 Actions Packages Projects Releases Wiki Activity

合并为一个项目 #14

Merged
xiaohai2271 merged 56 commits from issue11 into master 2020-05-16 22:35:08 +08:00
Conversation 0 Commits 56 Files Changed 683 +8 -8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e5524397b - Show all commits

2
.github/workflows/nodejs.yml vendored
View File

@@ -30,7 +30,7 @@ jobs:
username: ${{ secrets.SSH_USERNAME }} username: ${{ secrets.SSH_USERNAME }}
password: ${{ secrets.SSH_PASSWORD }} password: ${{ secrets.SSH_PASSWORD }}
port: ${{ secrets.SSH_PORT }} port: ${{ secrets.SSH_PORT }}
source: "admin.tar,index.tar" source: "index.tar"
target: "/www/wwwroot/celess.cn" target: "/www/wwwroot/celess.cn"
- name: Run SSH command - name: Run SSH command

14
build.sh
View File

@@ -27,14 +27,14 @@ fi
# index # index
echo -e "\t\tBuild for index page " echo -e "\t\tBuild for index page "
cd ./index && npm install && ng build --prod npm install && ng build --prod
cd ./dist/index/ && tar -cf index.tar ./* && cp index.tar $basePath cd ./dist/index/ && tar -cf index.tar ./* && cp index.tar $basePath
cd "$basePath" #cd "$basePath"
# admin ## admin
echo -e "\t\tBuild for admin page " #echo -e "\t\tBuild for admin page "
cd $basePath/admin && npm install && ng build --prod #cd $basePath/admin && npm install && ng build --prod
cd ./dist/admin/ && sed '6s/\"\/\"/\"\/admin\/\"/g' index.html > index.txt && cp index.txt index.html #cd ./dist/admin/ && sed '6s/\"\/\"/\"\/admin\/\"/g' index.html > index.txt && cp index.txt index.html
cd .. && tar -cf admin.tar ./admin/ && cp admin.tar $basePath # cd .. && tar -cf admin.tar ./admin/ && cp admin.tar $basePath