Reduce

Author: nateinaction

.github/workflows/ci.yaml

@@ -136,19 +136,6 @@ jobs:
           echo "✗ ARM toolchain not found"
         fi
 
-    - name: Display setup statistics
-      run: |
-        echo "=== Setup Statistics ==="
-        echo "Git submodules cache hit: ${{ steps.cache-submodules.outputs.cache-hit }}"
-        echo "Zephyr modules cache hit: ${{ steps.cache-zephyr.outputs.cache-hit }}"
-        echo ""
-        echo "Submodule sizes:"
-        du -sh lib/fprime lib/fprime-zephyr lib/zephyr-workspace/zephyr 2>/dev/null || echo "Some submodules not found"
-        echo ""
-        echo "Zephyr modules size: $(du -sh lib/zephyr-workspace/modules lib/zephyr-workspace/bootloader 2>/dev/null | awk '{sum+=$1} END {print sum"M"}' || echo 'N/A')"
-        echo "SDK size: $(du -sh ~/zephyr-sdk-0.17.2 2>/dev/null | cut -f1 || echo 'N/A')"
-        echo "Total modules count: $(find lib/zephyr-workspace/modules lib/zephyr-workspace/bootloader -name '.git' -type d 2>/dev/null | wc -l)"
-
     - name: Build for PROVES Flight Control Board v5c
       run: |
         # Skip both zephyr-setup and submodules since we cached them separately
@@ -157,21 +144,8 @@ jobs:
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: firmware-v5c
+        name: artifacts
         path: |
           build-artifacts/zephyr.uf2
-          build-artifacts/zephyr.elf
-          build-artifacts/zephyr.hex
-          build-artifacts/zephyr.bin
+          build-artifacts/zephyr/fprime-zephyr-deployment/dict/ReferenceDeploymentTopologyDictionary.json
         retention-days: 30
-
-    - name: Display build statistics
-      if: success()
-      run: |
-        echo "=== Build Statistics ==="
-        if [ -f build-artifacts/zephyr.uf2 ]; then
-          echo "Firmware size: $(ls -lh build-artifacts/zephyr.uf2 | awk '{print $5}')"
-        fi
-        echo ""
-        echo "Memory usage:"
-        cat build-fprime-automatic-zephyr/zephyr/zephyr.stat 2>/dev/null || echo "Stats not available"

Makefile

@@ -6,9 +6,6 @@ help: ## Display this help.
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 
 ##@ Dependencies
-# Note: Zephyr setup uses minimal modules and ARM-only toolchain for RP2040/RP2350
-# This saves ~3-4 GB compared to full installation. See docs/additional-resources/west-manifest-setup.md
-# Hello World!
 
 .PHONY: submodules
 submodules: ## Initialize and update git submodules
@@ -23,37 +20,16 @@ fprime-venv: ## Create a virtual environment
 		@$(UV) pip install --requirement requirements.txt
 
 .PHONY: zephyr-setup
-zephyr-setup: fprime-venv ## Set up Zephyr environment (minimal RP2040/RP2350 only)
-	@test -d lib/zephyr-workspace/modules/hal/rpi_pico || test -d ../lib/zephyr-workspace/modules/hal/rpi_pico || { \
-		echo "Setting up minimal Zephyr environment (RP2040/RP2350 only)..."; \
-		echo "  - Using minimal module set (~80% disk space reduction)"; \
-		echo "  - Installing ARM toolchain only (~92% SDK reduction)"; \
-		if [ ! -f .west/config ] && [ ! -f ../.west/config ]; then \
-			echo "  - Initializing West workspace..."; \
-			$(UVX) west init -l .; \
-		fi && \
+zephyr-setup: fprime-venv ## Set up Zephyr environment
+	@test -d lib/zephyr-workspace/modules/hal/rpi_pico { \
+		echo "Setting up Zephyr environment..."; \
+		$(UVX) west init -l . && \
 		$(UVX) west update && \
 		$(UVX) west zephyr-export && \
 		$(UV) run west packages pip --install && \
 		$(UV) run west sdk install --toolchains arm-zephyr-eabi; \
 	}
 
-.PHONY: zephyr-setup-full
-zephyr-setup-full: fprime-venv ## Set up Zephyr with ALL modules and toolchains (not recommended)
-	@echo "Setting up FULL Zephyr environment (all modules and toolchains)..."
-	@echo "Warning: This will download 4-6 GB of data"
-	@read -p "Continue? [y/N] " -n 1 -r; \
-	echo; \
-	if [[ $$REPLY =~ ^[Yy]$$ ]]; then \
-		$(UVX) west config manifest.path lib/zephyr-workspace/zephyr && \
-		$(UVX) west update && \
-		$(UVX) west zephyr-export && \
-		$(UV) run west packages pip --install && \
-		$(UV) run west sdk install; \
-	else \
-		echo "Cancelled. Use 'make zephyr-setup' for minimal installation."; \
-	fi
-
 ##@ Development
 
 .PHONY: pre-commit-install