clean up the after effects of bringing back webUI
This commit is contained in:
@@ -50,19 +50,12 @@ jobs:
|
|||||||
cd master
|
cd master
|
||||||
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
||||||
|
|
||||||
- name: Cache node_modules
|
- name: Build Jar
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
**/webUI/node_modules
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
|
|
||||||
|
|
||||||
- name: Build and copy webUI, Build Jar
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
with:
|
with:
|
||||||
build-root-directory: master
|
build-root-directory: master
|
||||||
wrapper-directory: master
|
wrapper-directory: master
|
||||||
arguments: :webUI:copyBuild :server:shadowJar --stacktrace
|
arguments: :server:shadowJar --stacktrace
|
||||||
wrapper-cache-enabled: true
|
wrapper-cache-enabled: true
|
||||||
dependencies-cache-enabled: true
|
dependencies-cache-enabled: true
|
||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
@@ -52,21 +52,14 @@ jobs:
|
|||||||
cd master
|
cd master
|
||||||
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
curl https://raw.githubusercontent.com/Suwayomi/Tachidesk/android-jar/android.jar -o AndroidCompat/lib/android.jar
|
||||||
|
|
||||||
- name: Cache node_modules
|
- name: Build Jar
|
||||||
uses: actions/cache@v2
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
**/webUI/node_modules
|
|
||||||
key: ${{ runner.os }}-${{ hashFiles('**/webUI/yarn.lock') }}
|
|
||||||
|
|
||||||
- name: Build and copy webUI, Build Jar
|
|
||||||
uses: eskatos/gradle-command-action@v1
|
uses: eskatos/gradle-command-action@v1
|
||||||
env:
|
env:
|
||||||
ProductBuildType: "Preview"
|
ProductBuildType: "Preview"
|
||||||
with:
|
with:
|
||||||
build-root-directory: master
|
build-root-directory: master
|
||||||
wrapper-directory: master
|
wrapper-directory: master
|
||||||
arguments: :webUI:copyBuild :server:shadowJar --stacktrace
|
arguments: :server:shadowJar --stacktrace
|
||||||
wrapper-cache-enabled: true
|
wrapper-cache-enabled: true
|
||||||
dependencies-cache-enabled: true
|
dependencies-cache-enabled: true
|
||||||
configuration-cache-enabled: true
|
configuration-cache-enabled: true
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
int main() {
|
|
||||||
system("start jre\\bin\\javaw -jar Tachidesk.jar");
|
|
||||||
}
|
|
||||||
@@ -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`
|
|
||||||
@@ -65,7 +65,6 @@ WINEARCH=win32 wine $rcedit $release_name/electron/electron.exe --set-icon ../se
|
|||||||
|
|
||||||
# copy artifacts
|
# copy artifacts
|
||||||
cp $jar $release_name/Tachidesk.jar
|
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 Browser Launcher.bat" $release_name
|
||||||
cp "resources/Tachidesk Debug Launcher.bat" $release_name
|
cp "resources/Tachidesk Debug Launcher.bat" $release_name
|
||||||
cp "resources/Tachidesk Electron Launcher.bat" $release_name
|
cp "resources/Tachidesk Electron Launcher.bat" $release_name
|
||||||
|
|||||||
@@ -172,7 +172,6 @@ tasks {
|
|||||||
|
|
||||||
named<Copy>("processResources") {
|
named<Copy>("processResources") {
|
||||||
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
duplicatesStrategy = DuplicatesStrategy.INCLUDE
|
||||||
mustRunAfter(":webUI:copyBuild")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
withType<LintTask> {
|
withType<LintTask> {
|
||||||
|
|||||||
Reference in New Issue
Block a user