Improve GitHub Actions workflows: add permissions, consolidate build steps, and configure artifact retention

.github/workflows/build.yml

@@ -6,27 +6,45 @@ on:
   pull_request:
     branches: [ main ]
 
+permissions:
+  contents: read
+  pull-requests: read
+
 jobs:
   build:
     name: 🔨 Build and Package
     runs-on: ubuntu-latest
-
+    
     steps:
       - name: 🧩 Checkout source code
         uses: actions/checkout@v4
-
+        
       - name: ☕ Set up Java
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '21'
           cache: maven
-
+
+      - name: 🔧 Make Maven wrapper executable
+        run: chmod +x mvnw
+
       - name: 🧰 Build using Maven Wrapper
         run: ./mvnw -B clean package
-
+        
       - name: 📦 Upload built JAR artifact
+        if: success()
         uses: actions/upload-artifact@v4
         with:
-          name: MyCMD-GUI
+          name: MyCMD-GUI-${{ github.sha }}
           path: target/*.jar
+          retention-days: 30
+
+      - name: 📊 Upload test results (if any)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-${{ github.sha }}
+          path: target/surefire-reports/
+          retention-days: 7
+        continue-on-error: true

.github/workflows/ci.yml

@@ -19,30 +19,30 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-
+          
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
-
+          
       - name: Cache Maven local repository
         uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-
-      - name: Build (Maven)
-        run: mvn -B -DskipTests=false package
-
-      - name: Run tests
-        run: mvn test -B
-
-      - name: Upload build artifact (optional)
+
+      - name: Build and Test with Maven
+        run: mvn -B clean package
+        # 'package' phase includes: compile → test → package
+        # Tests run automatically unless -DskipTests=true is specified
+
+      - name: Upload build artifact
         if: success()
         uses: actions/upload-artifact@v4
         with:
           name: mycmd-build
           path: target/*.jar
+          retention-days: 7  # Auto-cleanup after 7 days

.github/workflows/formatter.yml

@@ -1,25 +1,23 @@
-name: Apply Spotless Formatting
+name: 🧼 Apply Spotless Formatting
 
 on:
-  pull_request:
-    branches:
-      - main
   push:
-    branches:
-      - main
+    branches: [main]
+
+permissions:
+  contents: write
 
 jobs:
   format:
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+      group: ${{ github.workflow }}-${{ github.ref_name }}
       cancel-in-progress: true
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.head_ref || github.ref_name }}
           fetch-depth: 0
 
       - name: Set up JDK 17
@@ -32,15 +30,18 @@ jobs:
       - name: Apply Spotless formatting
         run: mvn spotless:apply
 
-      - name: Commit changes if any
+      - name: Commit and push formatting changes
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          if ! git diff --quiet --staged; then
+          git add -A
+          if ! git diff --cached --quiet; then
             git commit -m "Apply Spotless formatting"
-            git pull --rebase origin ${{ github.head_ref || github.ref_name }}
-            git push origin HEAD:${{ github.head_ref || github.ref_name }}
+            if ! git pull --rebase --autostash origin ${{ github.ref_name }}; then
+              echo "❌ Rebase failed; manual intervention required."
+              exit 1
+            fi
+            git push origin HEAD:${{ github.ref_name }}
           else
-            echo "No formatting changes to commit."
+            echo "✅ No formatting changes to commit."
           fi

pom.xml

@@ -16,6 +16,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <javafx.version>21</javafx.version>
+        <spotless.version>2.43.0</spotless.version>
     </properties>
 
     <dependencies>
@@ -55,6 +56,7 @@
                 </configuration>
             </plugin>
 
+            <!-- Shade Plugin (for fat jar) -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -75,6 +77,30 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <!-- Spotless Plugin (Code Formatter) -->
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>${spotless.version}</version>
+                <configuration>
+                    <java>
+                        <!-- Uses Google's Java format -->
+                        <googleJavaFormat />
+                    </java>
+                </configuration>
+                <executions>
+                    <!-- Automatically checks formatting during build -->
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>
+
 </project>

src/main/java/com/mycmd/App.java

@@ -3,20 +3,18 @@
 import com.mycmd.gui.MainApp;
 import javafx.application.Application;
 
-/**
- * Entry point for MyCMD-GUI.
- */
+/** Entry point for MyCMD-GUI. */
 public class App {
-    public static void main(String[] args) {
-        // Security check to prevent CMD access
-        String launchedFrom = System.getenv("MYCMD_LAUNCHED");
-        if (launchedFrom == null || !launchedFrom.equalsIgnoreCase("true")) {
-            System.out.println("❌ MyCMD-GUI cannot be run directly from CMD.");
-            System.out.println("➡️  Please use the official launcher (MyCMD.bat).");
-            return;
-        }
-
-        // Launch JavaFX GUI
-        Application.launch(MainApp.class, args);
+  public static void main(String[] args) {
+    // Security check to prevent CMD access
+    String launchedFrom = System.getenv("MYCMD_LAUNCHED");
+    if (launchedFrom == null || !launchedFrom.equalsIgnoreCase("true")) {
+      System.out.println("❌ MyCMD-GUI cannot be run directly from CMD.");
+      System.out.println("➡️  Please use the official launcher (MyCMD.bat).");
+      return;
     }
+
+    // Launch JavaFX GUI
+    Application.launch(MainApp.class, args);
+  }
 }

src/main/java/com/mycmd/Command.java

@@ -2,12 +2,11 @@
 
 import java.io.IOException;
 
-/**
- * Interfaace for all commands.
- * Every command impleements this
- */
+/** Interfaace for all commands. Every command impleements this */
 public interface Command {
-    void execute(String[] args, ShellContext context) throws IOException;
-    String description();
-    String usage();
+  void execute(String[] args, ShellContext context) throws IOException;
+
+  String description();
+
+  String usage();
 }

src/main/java/com/mycmd/CommandRegistry.java

@@ -3,21 +3,19 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * Registers and retrieves commands by name.
- */
+/** Registers and retrieves commands by name. */
 public class CommandRegistry {
-    private final Map<String, Command> commands = new HashMap<>();
+  private final Map<String, Command> commands = new HashMap<>();
 
-    public void register(String name, Command cmd) {
-        commands.put(name.toLowerCase(), cmd);
-    }
+  public void register(String name, Command cmd) {
+    commands.put(name.toLowerCase(), cmd);
+  }
 
-    public Command get(String name) {
-        return commands.get(name.toLowerCase());
-    }
+  public Command get(String name) {
+    return commands.get(name.toLowerCase());
+  }
 
-    public Map<String, Command> getAll() {
-        return commands;
-    }
+  public Map<String, Command> getAll() {
+    return commands;
+  }
 }

src/main/java/com/mycmd/ConsoleShell.java

@@ -2,26 +2,24 @@
 
 import java.util.Scanner;
 
-/**
- * Developer console mode for debugging.
- */
+/** Developer console mode for debugging. */
 public class ConsoleShell {
 
-    public static void main(String[] args) {
-        CommandRegistry registry = new CommandRegistry();
-        ShellContext context = new ShellContext();
-        ShellEngine engine = new ShellEngine(registry, context);
+  public static void main(String[] args) {
+    CommandRegistry registry = new CommandRegistry();
+    ShellContext context = new ShellContext();
+    ShellEngine engine = new ShellEngine(registry, context);
 
-        Scanner sc = new Scanner(System.in);
-        System.out.println("MyCMD Developer Console Mode\n(Type 'exit' to quit)");
+    Scanner sc = new Scanner(System.in);
+    System.out.println("MyCMD Developer Console Mode\n(Type 'exit' to quit)");
 
-        while (true) {
-            System.out.print("> ");
-            String input = sc.nextLine();
-            if (input.equalsIgnoreCase("exit")) break;
-            engine.execute(input);
-        }
-
-        sc.close();
+    while (true) {
+      System.out.print("> ");
+      String input = sc.nextLine();
+      if (input.equalsIgnoreCase("exit")) break;
+      engine.execute(input);
     }
+
+    sc.close();
+  }
 }