Workflow improvement

CiroZDP · Sep 14, 2024 · 3d57894 · 3d57894
1 parent 995b1bc
commit 3d57894
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -8,13 +8,11 @@
 
 #  - OpenCraft Studios Team
 
-name: Java CI with Maven
+name: Generate artifacts
 
 on:
-  push:
-    branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
+  release:
+    types: [published]
 
 jobs:
   build:
@@ -23,7 +21,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Set up JDK 8
+    - name: Download JDK 1.8
       id: compile
       uses: actions/setup-java@v4
       with:
@@ -32,7 +30,8 @@ jobs:
         cache: maven
         server-username: MAVEN_USERNAME
         server-password: MAVEN_PASSWORD
-    - name: Build with Maven
+
+    - name: Compile client
       run: mvn -B package --file pom.xml
       env:
         MAVEN_USERNAME: CiroZDP
@@ -42,5 +41,5 @@ jobs:
     - uses: ./.github/actions/upload_build
       if: ${{ always() && steps.compile.outcome == 'success' }}
       with:
-        SOURCE_FILE: 'target/OpenCraft-24r12-jar-with-dependencies.jar'
+        SOURCE_FILE: 'target/client.jar'
         DEST_NAME: 'client.jar'
diff --git a/pom.xml b/pom.xml
@@ -84,15 +84,19 @@
 	</dependencies>
 
 	<build>
+		<!-- JAR name -->
+		<finalName>client</finalName>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
+				<version>3.13.0</version>
 				<configuration>
 					<encoding>${project.build.sourceEncoding}</encoding>
 					<source>1.8</source>
 					<target>1.8</target>
+
+					<!-- Lombok for annotations -->
 					<annotationProcessorPaths>
 						<path>
 							<groupId>org.projectlombok</groupId>
@@ -102,6 +106,8 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
+
+			<!-- Plugin for resources/ folder -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-resources-plugin</artifactId>
@@ -110,27 +116,40 @@
 					<encoding>${project.build.sourceEncoding}</encoding>
 				</configuration>
 			</plugin>
+
+			<!-- JAR Packaging plugin -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>3.3.0</version>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.2.0</version>
 				<configuration>
-					<descriptorRefs>
-						<descriptorRef>jar-with-dependencies</descriptorRef>
-					</descriptorRefs>
+					<finalName>client</finalName>
 					<archive>
 						<manifest>
-							<mainClass>net.opencraft.OpenCraft</mainClass>
+							<mainClass>
+								net.opencraft.OpenCraft
+							</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
+			</plugin>
+
+			<!-- Dependency packaging plugin -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<version>3.3.0</version>
 				<executions>
 					<execution>
-						<id>make-assembly</id>
+						<id>copy-dependencies</id>
 						<phase>package</phase>
 						<goals>
-							<goal>single</goal>
+							<goal>copy-dependencies</goal>
 						</goals>
+						<configuration>
+							<outputDirectory>
+								${project.build.directory}/dependencies</outputDirectory>
+						</configuration>
 					</execution>
 				</executions>
 			</plugin>