Fix Jenkinsfile

Heath123 · Dec 31, 2020 · 15233eb · 15233eb
1 parent d4101d3
commit 15233eb
Show file tree

Hide file tree

Showing 4 changed files with 172 additions and 284 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -9,15 +9,12 @@ pipeline {
             steps {
                 sh 'npm install'
                 sh 'npx electron-forge package --platform win32'
-                sh 'cd out/pakkit-win32-x64/resources/app/; node-prune; npx electron-rebuild -v 8.5.2; cd node_modules/java/build; rm -rf Release'
-                sh 'cp -r javaCompiledReleaseWindows/Release out/pakkit-win32-x64/resources/app/node_modules/java/build/Release'
+                sh 'cd out/pakkit-win32-x64/resources/app/; node-prune; npx electron-rebuild -v 8.5.2'
                 sh 'npx electron-forge package --platform linux'
                 sh 'cd out/pakkit-linux-x64/resources/app/; node-prune; npx electron-rebuild -v 8.5.2;'
-                sh 'mv out/pakkit-linux-x64/pakkit out/pakkit-linux-x64/dont_run_directly'
-                sh 'mv launch_linux_ci_builds.sh out/pakkit-linux-x64/pakkit'
                 sh 'chmod +x out/pakkit-linux-x64/pakkit'
                 sh 'npx electron-forge package --platform darwin'
-                sh 'cd out/pakkit-darwin-x64/pakkit.app/Contents/Resources/app/; npx electron-rebuild -v 8.5.2;'
+                sh 'cd out/pakkit-darwin-x64/pakkit.app/Contents/Resources/app/; node-prune; npx electron-rebuild -v 8.5.2'
                 sh 'mv out/pakkit-win32-x64 pakkit-windows-x64'
                 sh 'mv out/pakkit-linux-x64 pakkit-linux-x64'
                 sh 'mv out/pakkit-darwin-x64 pakkit-macos-x64'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -50,7 +50,6 @@
     "electron-unhandled": "^3.0.2",
     "electron-window-state": "^5.0.3",
     "escape-html": "^1.0.3",
-    "java": "^0.12.1",
     "md5-file": "^5.0.0",
     "minecraft-data": "^2.70.2",
     "minecraft-folder-path": "^1.1.0",