fix build workflow and add release workflow

Author: Frotty

.github/workflows/build.yml

@@ -18,12 +18,6 @@ jobs:
         with:
           java-version: 17
           distribution: 'zulu' # Alternative distribution options are available
-      - name: Cache SonarCloud packages
-        uses: actions/cache@v3
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:
@@ -35,4 +29,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew build sonar --info
+        run: ./gradlew test --info

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: Build and Deploy WurstScript
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    name: Build WurstScript and Upload Artifacts
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: temurin
+
+      - name: Grant Gradle permissions
+        working-directory: ./de.peeeq.wurstscript
+        run: chmod +x ./gradlew
+
+      - name: Build WurstPack zips
+        working-directory: ./de.peeeq.wurstscript
+        run: ./gradlew create_zips
+
+      - name: Upload wurstpack_complete.zip as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wurstpack_complete
+          path: downloads/wurstpack_complete.zip
+
+      - name: Upload wurstpack_compiler.zip as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: wurstpack_compiler
+          path: downloads/wurstpack_compiler.zip

de.peeeq.wurstscript/build.gradle

@@ -17,6 +17,7 @@ plugins {
     id 'idea'
     id 'application'
     id "org.sonarqube" version "4.4.1.3373"
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
 }
 
 import de.undercouch.gradle.tasks.download.Download

de.peeeq.wurstscript/deploy.gradle

@@ -1,90 +1,98 @@
-// To publish first run ./gradlew installDist
-// then copy to wurstpack folder
+// Apply shadow plugin (assumes this is applied from main build.gradle with buildscript setup)
+apply plugin: 'com.github.johnrengelman.shadow'
 
-jar {
-    version = null
+// Shadow JAR config using externally defined mainClassName
+shadowJar {
+    archiveBaseName.set('wurstscript')
+    archiveClassifier.set('')
+    archiveVersion.set('')
     manifest {
-        attributes(
-                'Class-Path': configurations.runtimeClasspath.collect { it.getName() }.join(' '),
-                'Main-Class': mainClassName
-        )
+        attributes 'Main-Class': mainClassName
     }
 }
 
+// Get reference to fat JAR for reuse
+def fatJar = shadowJar.archiveFile.map { it.asFile }
+
+// Install fat jar into ~/.wurst
 task make_for_userdir(type: Copy) {
-    from 'build/install/wurstscript/lib'
+    from fatJar
     into "${System.properties['user.home']}/.wurst/"
 }
+make_for_userdir.dependsOn(shadowJar)
 
-make_for_userdir.dependsOn(installDist)
-
+// Copy fat jar into Wurstpack bundle dir
 task make_for_wurstpack(type: Copy) {
-    from 'build/install/wurstscript/lib'
+    from fatJar
     into '../Wurstpack/wurstscript/'
 }
-make_for_wurstpack.dependsOn(installDist)
-
+make_for_wurstpack.dependsOn(shadowJar)
 
+// Full zip of Wurstpack (includes wrappers, .exe, etc.)
 task create_zip_wurstpack_complete(type: Zip) {
     from '../Wurstpack'
     archiveFileName.set('wurstpack_complete.zip')
 }
 create_zip_wurstpack_complete.dependsOn(make_for_wurstpack)
 
+// Compiler-only zip (just the fat jar and related files)
 task create_zip_wurstpack_compiler(type: Zip) {
     from '../Wurstpack/wurstscript/'
     archiveFileName.set('wurstpack_compiler.zip')
 }
 create_zip_wurstpack_compiler.dependsOn(make_for_wurstpack)
 
-
-
+// Bundle downloads for GitHub release
 task create_zips {
     doLast {
         mkdir("../downloads/")
+
         copy {
-            from 'build/distributions/'
-            into '../downloads/'
-        }
-        copy {
-            from 'build/install/wurstscript/lib/wurstscript.jar'
+            from fatJar
             into '../downloads/'
         }
+
         copy {
             from '../Wurstpack'
             into '../downloads/Wurstpack/'
         }
+
         copy {
             from '../WurstSetup/build/libs/WurstSetup.jar'
             into '../downloads/'
         }
-        // create checksums
-        mkdir("../Checksums/bin")
 
+        // Generate checksums
+        mkdir("../Checksums/bin")
         javaexec {
             classpath = sourceSets.main.runtimeClasspath
             main = "de.peeeq.wurstio.Checksums"
-            args = ["../downloads/Wurstpack/",
-                    "../downloads/wurstpack.md5"]
+            args = [
+                    "../downloads/Wurstpack/",
+                    "../downloads/wurstpack.md5"
+            ]
         }
     }
 }
-create_zips.dependsOn(installDist)
+create_zips.dependsOn(shadowJar)
 create_zips.dependsOn(create_zip_wurstpack_complete)
 create_zips.dependsOn(create_zip_wurstpack_compiler)
 
+// Hotdoc generation
 task generate_hotdoc {
     doLast {
         copy {
-            from("/src/main/resources/")
-            into("/build/classes/main/")
+            from("src/main/resources/")
+            into("build/classes/main/")
         }
         javaexec {
             classpath = sourceSets.main.runtimeClasspath
             main = "de.peeeq.wurstio.Main"
-            args = ["--hotdoc",
+            args = [
+                    "--hotdoc",
                     "./build/deps/",
-                    "../downloads/hotdoc"]
+                    "../downloads/hotdoc"
+            ]
         }
     }
 }