diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index f948deb15..e7c841bb3 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -25,15 +25,24 @@ jobs: with: node-version: '14' - run: | - echo 'Removing old wwwroot' - rm -rf API/wwwroot/* + echo 'Checking folder structure' + ls -l + cd Kavita-webui/ || exit echo 'Installing web dependencies' npm install + echo 'Building UI' npm run prod + + echo 'Checking dist folder for compiling integrity' + ls -l dist + 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 - name: Compile dotnet app diff --git a/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml index 58779e580..ed28452c5 100644 --- a/.github/workflows/stable-docker.yml +++ b/.github/workflows/stable-docker.yml @@ -32,8 +32,13 @@ jobs: npm install echo 'Building UI' npm run prod + echo 'Checking dist folder for compiling integrity' + ls -l dist echo 'Copying back to Kavita wwwroot' + mkdir ../API/wwwroot cp -r dist/* ../API/wwwroot + echo 'Checking Kavita wwwroot for copying integrity' + ls -l ../API/wwwroot cd ../ || exit - name: Compile dotnet app diff --git a/API/Extensions/ServiceCollectionExtensions.cs b/API/Extensions/ServiceCollectionExtensions.cs index 1b752431c..62a0575ef 100644 --- a/API/Extensions/ServiceCollectionExtensions.cs +++ b/API/Extensions/ServiceCollectionExtensions.cs @@ -16,7 +16,7 @@ namespace API.Extensions { services.AddHttpClient(client => { - client.BaseAddress = new Uri("https://kavitastats.majora2007.duckdns.org"); + client.BaseAddress = new Uri("https://stats.kavitareader.com"); client.DefaultRequestHeaders.Add("api-key", "MsnvA2DfQqxSK5jh"); }); diff --git a/action-build.sh b/action-build.sh index 4571c93e9..14fb8a086 100755 --- a/action-build.sh +++ b/action-build.sh @@ -34,6 +34,9 @@ Package() local runtime="$2" local lOutputFolder=../_output/"$runtime"/Kavita + echo "Integrity check on root folder" + ls -l + ProgressStart "Creating $runtime Package for $framework" # 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 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" mv "$lOutputFolder"/API "$lOutputFolder"/Kavita + echo "Integrity check on Kavita wwwroot folder" + ls -l "$lOutputFolder"/wwwroot + echo "Copying Install information" cp ../INSTALL.txt "$lOutputFolder"/README.txt @@ -69,8 +78,10 @@ BuildUI() npm install echo 'Building UI' npm run prod + ls -l dist echo 'Copying back to Kavita wwwroot' cp -r dist/* ../Kavita/API/wwwroot + ls -l ../Kavita/API/wwwroot cd ../Kavita/ || exit ProgressEnd 'Building UI' }