Fixed build issues (#325)

* 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

View File

@ -25,9 +25,15 @@ jobs:
with:
node-version: '14'
- run: |
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 ../ || exit
- name: Compile dotnet app

View File

@ -25,9 +25,15 @@ jobs:
with:
node-version: '14'
- run: |
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 ../ || exit
- name: Compile dotnet app

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
if [ -d _output ]

View File

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

View File

@ -37,6 +37,19 @@ BuildUI()
npm run prod
cd ../Kavita/ || exit
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()