Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build issues (#325)

Browse Source 
* Fixed build issues

* Fixed up workflows
This commit is contained in:
Joseph Milazzo 2021-06-25 09:15:19 -05:00 committed by GitHub
parent f50a21dd22
commit dfddb551d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/nightly-docker.yml vendored
View File

@ -25,9 +25,15 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- run: | - run: |
echo 'Removing old wwwroot'
rm -rf API/wwwroot/*
cd Kavita-webui/ || exit cd Kavita-webui/ || exit
echo 'Installing web dependencies'
npm install npm install
echo 'Building UI'
npm run prod npm run prod
echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../Kavita/API/wwwroot
cd ../ || exit cd ../ || exit
- name: Compile dotnet app - name: Compile dotnet app

6
.github/workflows/stable-docker.yml vendored
View File

@ -25,9 +25,15 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- run: | - run: |
echo 'Removing old wwwroot'
rm -rf API/wwwroot/*
cd Kavita-webui/ || exit cd Kavita-webui/ || exit
echo 'Installing web dependencies'
npm install npm install
echo 'Building UI'
npm run prod npm run prod
echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../Kavita/API/wwwroot
cd ../ || exit cd ../ || exit
- name: Compile dotnet app - name: Compile dotnet app

16
action-build.sh
View File

@ -59,6 +59,22 @@ Package()
} }
BuildUI()
{
ProgressStart 'Building UI'
echo 'Removing old wwwroot'
rm -rf API/wwwroot/*
cd ../Kavita-webui/ || exit
echo 'Installing web dependencies'
npm install
echo 'Building UI'
npm run prod
echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../Kavita/API/wwwroot
cd ../Kavita/ || exit
ProgressEnd 'Building UI'
}
dir=$PWD dir=$PWD
if [ -d _output ] if [ -d _output ]

3
build.sh
View File

@ -32,7 +32,6 @@ Build()
slnFile=Kavita.sln slnFile=Kavita.sln
#dotnet clean $slnFile -c Debug
dotnet clean $slnFile -c Release dotnet clean $slnFile -c Release
if [[ -z "$RID" ]]; if [[ -z "$RID" ]];
@ -102,8 +101,8 @@ Package()
RID="$1" RID="$1"
Build
BuildUI BuildUI
Build
dir=$PWD dir=$PWD

13
docker-build.sh
View File

@ -37,6 +37,19 @@ BuildUI()
npm run prod npm run prod
cd ../Kavita/ || exit cd ../Kavita/ || exit
ProgressEnd 'Building UI' ProgressEnd 'Building UI'
ProgressStart 'Building UI'
echo 'Removing old wwwroot'
rm -rf API/wwwroot/*
cd ../Kavita-webui/ || exit
echo 'Installing web dependencies'
npm install
echo 'Building UI'
npm run prod
echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../Kavita/API/wwwroot
cd ../Kavita/ || exit
ProgressEnd 'Building UI'
} }
Package() Package()