From a17d6a2ea4fcfcfc04796d39eb0a7334f6b5612f Mon Sep 17 00:00:00 2001
From: Aria Moradi <aria.moradi007@gmail.com>
Date: Sat, 7 Aug 2021 22:52:44 +0430
Subject: [PATCH] clean up the after effects of bringing back webUI

---
 .github/workflows/build_pull_request.yml | 11 ++---------
 .github/workflows/build_push.yml         | 11 ++---------
 scripts/resources/Tachidesk Launcher.c   |  5 -----
 scripts/resources/readme.md              |  3 ---
 scripts/windows-bundler.sh               |  1 -
 server/build.gradle.kts                  |  1 -
 6 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 scripts/resources/Tachidesk Launcher.c
 delete mode 100644 scripts/resources/readme.md

diff --git a/.github/workflows/build_pull_request.yml b/.github/workflows/build_pull_request.yml
index b88af641..b20f05cf 100644
--- a/.github/workflows/build_pull_request.yml
+++ b/.github/workflows/build_pull_request.yml
@@ -50,19 +50,12 @@ jobs:
           cd master
           curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            **/webUI/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
-
-      - name: Build and copy webUI, Build Jar
+      - name: Build Jar
         uses: eskatos/gradle-command-action@v1
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
\ No newline at end of file
diff --git a/.github/workflows/build_push.yml b/.github/workflows/build_push.yml
index dc4b5c66..3b20b114 100644
--- a/.github/workflows/build_push.yml
+++ b/.github/workflows/build_push.yml
@@ -52,21 +52,14 @@ jobs:
           cd master
           curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
 
-      - name: Cache node_modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            **/webUI/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
-
-      - name: Build and copy webUI, Build Jar
+      - name: Build Jar
         uses: eskatos/gradle-command-action@v1
         env:
           ProductBuildType: "Preview"
         with:
           build-root-directory: master
           wrapper-directory: master
-          arguments: :webUI:copyBuild :server:shadowJar --stacktrace
+          arguments: :server:shadowJar --stacktrace
           wrapper-cache-enabled: true
           dependencies-cache-enabled: true
           configuration-cache-enabled: true
diff --git a/scripts/resources/Tachidesk Launcher.c b/scripts/resources/Tachidesk Launcher.c
deleted file mode 100644
index 8d941d9b..00000000
--- a/scripts/resources/Tachidesk Launcher.c	
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdlib.h>
-
-int main() {
-    system("start jre\\bin\\javaw -jar  Tachidesk.jar");
-}
diff --git a/scripts/resources/readme.md b/scripts/resources/readme.md
deleted file mode 100644
index 038efd35..00000000
--- a/scripts/resources/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Building `Tachidesk Launcher.exe`
-1. compile `Tachidesk Launcher.c` statically with MSVC compiler.
-2. Add `server/src/main/resources/icon/faviconlogo.ico` into the exe with `rcedit` from the electron project: `rcedit "Tachidesk Launcher.exe" --set-icon faviconlogo.ico`
diff --git a/scripts/windows-bundler.sh b/scripts/windows-bundler.sh
index debc47a5..1caf8854 100755
--- a/scripts/windows-bundler.sh
+++ b/scripts/windows-bundler.sh
@@ -65,7 +65,6 @@ WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../se
 
 # copy artifacts
 cp $jar $release_name/Tachidesk.jar
-#cp "resources/Tachidesk Launcher-$arch.exe" "$release_name/Tachidesk Launcher.exe"
 cp "resources/Tachidesk Browser Launcher.bat" $release_name
 cp "resources/Tachidesk Debug Launcher.bat" $release_name
 cp "resources/Tachidesk Electron Launcher.bat" $release_name
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
index 1294bad1..7abbfdf9 100644
--- a/server/build.gradle.kts
+++ b/server/build.gradle.kts
@@ -172,7 +172,6 @@ tasks {
 
     named<Copy>("processResources") {
         duplicatesStrategy = DuplicatesStrategy.INCLUDE
-        mustRunAfter(":webUI:copyBuild")
     }
 
     withType<LintTask> {