refactor CI configuration for improved clarity and performance

Author: IntegralPilot

.github/workflows/ci.yml

@@ -20,11 +20,7 @@ jobs:
       uses: dtolnay/rust-toolchain@stable
       with:
         toolchain: nightly
-        components: rustc-dev llvm-tools, cargo
-
-    # 3. Cargo Caching (Crucial for speed)
-    - name: Cache cargo dependencies
-      uses: Swatinem/rust-cache@v2
+        components: rustc-dev llvm-tools cargo
 
     # 4. Set up Java
     - name: Set up Java
@@ -39,14 +35,22 @@ jobs:
       with:
         python-version: '3.x'
 
-    # 6. Set up Gradle)
+    # 6. Set up Gradle
     - name: Set up Gradle
       uses: gradle/actions/setup-gradle@v4
 
-    # 7. Build using the CI-specific make target
+    # 7. Make just the files needed to cargo cache
+    - name: Make Gen Files
+      run: make gen-files
+      
+    # 8. Cargo Caching (Crucial for speed)
+    - name: Cache cargo dependencies
+      uses: Swatinem/rust-cache@v2
+    
+    # 9. Build using the CI-specific make target
     - name: Build CI Target
       run: make ci # Use your optimized CI build command
 
-    # 8. Run tests
+    # 10. Run tests
     - name: Run integration tests
       run: python3 Tester.py

Makefile

@@ -16,11 +16,15 @@ LIBRARY_DIR := library
 LIBRARY_JAR := $(LIBRARY_DIR)/build/libs/library-0.1.0.jar
 
 # === Default Target ===
+ifeq ($(IS_CI),1)
+all: rust java-linker asm-processor
+	@echo "$(GREEN)✨ Build complete in CI mode! ✨$(RESET)"
+else
 all: rust gen-files java-linker asm-processor
 	@echo "$(GREEN)✨ Build complete! ✨$(RESET)"
+endif
 
 # === CI Target ===
-# Running "make ci" sets IS_CI=1 and then behaves exactly like "make all"
 ci:
 	$(MAKE) all IS_CI=1
 
@@ -89,22 +93,38 @@ clean-shim-metadata-gen:
 # === ASM Processor (Gradle) ===
 asm-processor:
 	@echo "$(CYAN)⚙️  Building ASM processor...$(RESET)"
+ifeq ($(IS_CI),1)
+	cd $(ASM_PROCESSOR_DIR) && gradle --no-daemon shadowJar
+else
 	cd $(ASM_PROCESSOR_DIR) && gradle shadowJar
+endif
 
 clean-asm-processor:
 	@echo "$(CYAN)🧹 Cleaning ASM processor...$(RESET)"
+ifeq ($(IS_CI),1)
+	cd $(ASM_PROCESSOR_DIR) && gradle --no-daemon clean
+else
 	cd $(ASM_PROCESSOR_DIR) && gradle clean
+endif
 
 # === Standard Library Shim (Gradle) ===
 library: $(LIBRARY_JAR)
 
 $(LIBRARY_JAR):
 	@echo "$(CYAN)📚 Building standard library shim...$(RESET)"
+ifeq ($(IS_CI),1)
+	cd $(LIBRARY_DIR) && gradle --no-daemon build && cd build/distributions && unzip -o library-0.1.0.zip
+else
 	cd $(LIBRARY_DIR) && gradle build && cd build/distributions && unzip -o library-0.1.0.zip
+endif
 
 clean-library:
 	@echo "$(CYAN)🧹 Cleaning library shim...$(RESET)"
+ifeq ($(IS_CI),1)
+	cd $(LIBRARY_DIR) && gradle --no-daemon clean
+else
 	cd $(LIBRARY_DIR) && gradle clean
+endif
 
 # === Generate files from templates ===
 gen-files: clean-gen-files
@@ -118,4 +138,4 @@ clean-gen-files:
 
 # === Clean All ===
 clean: clean-rust clean-java-linker clean-asm-processor clean-library clean-shim-metadata-gen clean-gen-files
-	@echo "$(GREEN)🧼 All clean!$(RESET)"
+	@echo "$(GREEN)🧼 All clean!$(RESET)"