From a97bd1bd540030beb45b511f49dcfa2c6f463629 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Fri, 25 Jun 2021 09:25:38 -0500 Subject: [PATCH 1/9] Github build actions (#326) --- .github/workflows/nightly-docker.yml | 2 +- .github/workflows/stable-docker.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index 38d243d8f..f948deb15 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -33,7 +33,7 @@ jobs: echo 'Building UI' npm run prod echo 'Copying back to Kavita wwwroot' - cp -r dist/* ../Kavita/API/wwwroot + cp -r dist/* ../API/wwwroot cd ../ || exit - name: Compile dotnet app diff --git a/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml index ab57ecb82..58779e580 100644 --- a/.github/workflows/stable-docker.yml +++ b/.github/workflows/stable-docker.yml @@ -33,7 +33,7 @@ jobs: echo 'Building UI' npm run prod echo 'Copying back to Kavita wwwroot' - cp -r dist/* ../Kavita/API/wwwroot + cp -r dist/* ../API/wwwroot cd ../ || exit - name: Compile dotnet app From 61c8ce36e0c861e8e6b21b89e3b13f190d506213 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Fri, 25 Jun 2021 09:41:22 -0500 Subject: [PATCH 2/9] Bugfix/build 2 (#327) * Github build actions * More fixes --- .github/workflows/nightly-docker.yml | 3 +-- .github/workflows/stable-docker.yml | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index f948deb15..d7a5fc6ee 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -25,14 +25,13 @@ 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' + mkdir ../API/wwwroot cp -r dist/* ../API/wwwroot cd ../ || exit diff --git a/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml index 58779e580..a0cb9c598 100644 --- a/.github/workflows/stable-docker.yml +++ b/.github/workflows/stable-docker.yml @@ -33,6 +33,7 @@ jobs: echo 'Building UI' npm run prod echo 'Copying back to Kavita wwwroot' + mkdir ../API/wwwroot cp -r dist/* ../API/wwwroot cd ../ || exit From dfd4b1ed6f28576d5017672dd2325efa04539d17 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 10:57:26 -0400 Subject: [PATCH 3/9] adding ls -l to workflow for integrity check (#328) --- .github/workflows/nightly-docker.yml | 4 ++++ .github/workflows/stable-docker.yml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index d7a5fc6ee..153f9f5dd 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -30,9 +30,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/.github/workflows/stable-docker.yml b/.github/workflows/stable-docker.yml index a0cb9c598..ed28452c5 100644 --- a/.github/workflows/stable-docker.yml +++ b/.github/workflows/stable-docker.yml @@ -32,9 +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 From 9b4712348401be3dd33d87f7739f6e45906691af Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 11:14:16 -0400 Subject: [PATCH 4/9] logging for dotnet ui build (#329) --- action-build.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/action-build.sh b/action-build.sh index 4571c93e9..3c396085a 100755 --- a/action-build.sh +++ b/action-build.sh @@ -69,8 +69,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' } From f29f2f67299e6c168c820ab0cd32ba29f639e608 Mon Sep 17 00:00:00 2001 From: Joseph Milazzo Date: Fri, 25 Jun 2021 10:21:28 -0500 Subject: [PATCH 5/9] Stat API Url change (#330) * Changed stat url to correct one --- API/Extensions/ServiceCollectionExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"); }); From 50bdb715b7bd38c8dea8b62d5f6069b1d9604817 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 12:33:02 -0400 Subject: [PATCH 6/9] adding debugging and path change (#332) --- .github/workflows/nightly-docker.yml | 6 +++--- action-build.sh | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index 153f9f5dd..98556c37f 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -33,10 +33,10 @@ jobs: echo 'Checking dist folder for compiling integrity' ls -l dist echo 'Copying back to Kavita wwwroot' - mkdir ../API/wwwroot - cp -r dist/* ../API/wwwroot + mkdir ../Kavita/API/wwwroot + cp -r dist/* ../Kavita/API/wwwroot echo 'Checking Kavita wwwroot for copying integrity' - ls -l ../API/wwwroot + ls -l ../Kavita/API/wwwroot cd ../ || exit - name: Compile dotnet app diff --git a/action-build.sh b/action-build.sh index 3c396085a..ce7e5ed75 100755 --- a/action-build.sh +++ b/action-build.sh @@ -42,9 +42,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"/API/wwwroot + echo "Renaming API -> Kavita" mv "$lOutputFolder"/API "$lOutputFolder"/Kavita + echo "Integrity check on Kavita wwwroot folder" + ls -l "$lOutputFolder"/Kavita/wwwroot + echo "Copying Install information" cp ../INSTALL.txt "$lOutputFolder"/README.txt From 0533de7420852801c27776797479a8a2349b2b2f Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 12:51:25 -0400 Subject: [PATCH 7/9] Bugfix/workflow test (#333) * adding debugging and path change * more logging and change to rsync --- .github/workflows/nightly-docker.yml | 11 +++++++++-- action-build.sh | 3 +++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index 98556c37f..b7f49dcf3 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -25,16 +25,23 @@ jobs: with: node-version: '14' - run: | + 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' - mkdir ../Kavita/API/wwwroot - cp -r dist/* ../Kavita/API/wwwroot + mkdir ../API/wwwroot + rsync -a dist/ ../API/wwwroot/ + echo 'Checking Kavita wwwroot for copying integrity' ls -l ../Kavita/API/wwwroot cd ../ || exit diff --git a/action-build.sh b/action-build.sh index ce7e5ed75..4306c7aee 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 From acbd4ce2527fa3c80a1a4373ee6badf50b3eab67 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 13:21:33 -0400 Subject: [PATCH 8/9] testing out rsync (#334) --- .github/workflows/nightly-docker.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/nightly-docker.yml b/.github/workflows/nightly-docker.yml index b7f49dcf3..e7c841bb3 100644 --- a/.github/workflows/nightly-docker.yml +++ b/.github/workflows/nightly-docker.yml @@ -39,11 +39,10 @@ jobs: ls -l dist echo 'Copying back to Kavita wwwroot' - mkdir ../API/wwwroot rsync -a dist/ ../API/wwwroot/ echo 'Checking Kavita wwwroot for copying integrity' - ls -l ../Kavita/API/wwwroot + ls -l ../API/wwwroot cd ../ || exit - name: Compile dotnet app From 733460e530c05bda128ba4a28a4b8b8bbf8a4031 Mon Sep 17 00:00:00 2001 From: Robbie Davis Date: Fri, 25 Jun 2021 13:32:11 -0400 Subject: [PATCH 9/9] fixing ls (#335) --- action-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/action-build.sh b/action-build.sh index 4306c7aee..14fb8a086 100755 --- a/action-build.sh +++ b/action-build.sh @@ -46,13 +46,13 @@ Package() dotnet publish -c Release --no-restore --self-contained --runtime $runtime -o "$lOutputFolder" --framework $framework echo "Integrity check on API wwwroot folder" - ls -l "$lOutputFolder"/API/wwwroot + ls -l "$lOutputFolder"/wwwroot echo "Renaming API -> Kavita" mv "$lOutputFolder"/API "$lOutputFolder"/Kavita echo "Integrity check on Kavita wwwroot folder" - ls -l "$lOutputFolder"/Kavita/wwwroot + ls -l "$lOutputFolder"/wwwroot echo "Copying Install information" cp ../INSTALL.txt "$lOutputFolder"/README.txt