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

Merged

Browse Source
This commit is contained in:
Joseph Milazzo 2021-06-25 13:15:10 -05:00
commit 534c2d2065
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,15 +25,24 @@ jobs:
with: with:
node-version: '14' node-version: '14'
- run: | - run: |
echo 'Removing old wwwroot' echo 'Checking folder structure'
rm -rf API/wwwroot/* ls -l
cd Kavita-webui/ || exit cd Kavita-webui/ || exit
echo 'Installing web dependencies' echo 'Installing web dependencies'
npm install npm install
echo 'Building UI' echo 'Building UI'
npm run prod npm run prod
echo 'Checking dist folder for compiling integrity'
ls -l dist
echo 'Copying back to Kavita wwwroot' echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../API/wwwroot rsync -a dist/ ../API/wwwroot/
echo 'Checking Kavita wwwroot for copying integrity'
ls -l ../API/wwwroot
cd ../ || exit cd ../ || exit
- name: Compile dotnet app - name: Compile dotnet app

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

@ -32,8 +32,13 @@ jobs:
npm install npm install
echo 'Building UI' echo 'Building UI'
npm run prod npm run prod
echo 'Checking dist folder for compiling integrity'
ls -l dist
echo 'Copying back to Kavita wwwroot' echo 'Copying back to Kavita wwwroot'
mkdir ../API/wwwroot
cp -r dist/* ../API/wwwroot cp -r dist/* ../API/wwwroot
echo 'Checking Kavita wwwroot for copying integrity'
ls -l ../API/wwwroot
cd ../ || exit cd ../ || exit
- name: Compile dotnet app - name: Compile dotnet app

2
API/Extensions/ServiceCollectionExtensions.cs
View File

@ -16,7 +16,7 @@ namespace API.Extensions
{ {
services.AddHttpClient<StatsApiClient>(client => services.AddHttpClient<StatsApiClient>(client =>
{ {
client.BaseAddress = new Uri("https://kavitastats.majora2007.duckdns.org"); client.BaseAddress = new Uri("https://stats.kavitareader.com");
client.DefaultRequestHeaders.Add("api-key", "MsnvA2DfQqxSK5jh"); client.DefaultRequestHeaders.Add("api-key", "MsnvA2DfQqxSK5jh");
}); });

11
action-build.sh
View File

@ -34,6 +34,9 @@ Package()
local runtime="$2" local runtime="$2"
local lOutputFolder=../_output/"$runtime"/Kavita local lOutputFolder=../_output/"$runtime"/Kavita
echo "Integrity check on root folder"
ls -l
ProgressStart "Creating $runtime Package for $framework" ProgressStart "Creating $runtime Package for $framework"
# TODO: Use no-restore? Because Build should have already done it for us # TODO: Use no-restore? Because Build should have already done it for us
@ -42,9 +45,15 @@ Package()
echo dotnet publish -c Release --no-restore --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework echo dotnet publish -c Release --no-restore --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework
dotnet publish -c Release --no-restore --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework dotnet publish -c Release --no-restore --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework
echo "Integrity check on API wwwroot folder"
ls -l "$lOutputFolder"/wwwroot
echo "Renaming API -> Kavita" echo "Renaming API -> Kavita"
mv "$lOutputFolder"/API "$lOutputFolder"/Kavita mv "$lOutputFolder"/API "$lOutputFolder"/Kavita
echo "Integrity check on Kavita wwwroot folder"
ls -l "$lOutputFolder"/wwwroot
echo "Copying Install information" echo "Copying Install information"
cp ../INSTALL.txt "$lOutputFolder"/README.txt cp ../INSTALL.txt "$lOutputFolder"/README.txt
@ -69,8 +78,10 @@ BuildUI()
npm install npm install
echo 'Building UI' echo 'Building UI'
npm run prod npm run prod
ls -l dist
echo 'Copying back to Kavita wwwroot' echo 'Copying back to Kavita wwwroot'
cp -r dist/* ../Kavita/API/wwwroot cp -r dist/* ../Kavita/API/wwwroot
ls -l ../Kavita/API/wwwroot
cd ../Kavita/ || exit cd ../Kavita/ || exit
ProgressEnd 'Building UI' ProgressEnd 'Building UI'
} }