fix: 🐛 Reorder pxt package installation to avoid CI crash

Author: nedseb

Makefile

@@ -16,32 +16,52 @@ prepare:
 	git config core.hooksPath .hooks
 
 .PHONY: setup
-setup: prepare clean $(PXT) 
+setup: deepclean $(PXT) $(PXT_INSTALL_LIBRARIES) build-pxt-core
+	@echo "Setup makecode-steami"
 
 .PHONY : clean
 clean : ;@$(call _clean)
 
+.PHONY : clean-pxt-core
+clean-pxt-core : ;@$(call _clean_pxt_core)
+
+.PHONY : clean-pxt-common-packages
+clean-pxt-common-packages : ;@$(call _clean_pxt_common_packages)
+
 .PHONY : clean-local-certificates
-clean-local-certificates:;@$(call _clean_pxt_steami_backend_certificates)
+clean-local-certificates : ;@$(call _clean_pxt_steami_backend_certificates)
 
 .PHONY : deepclean
 deepclean : ;@$(call _deepclean)
 
 # Create make rule for each PXT command
 $(foreach command,$(PXT_COMMANDS),$(eval $(call _call_pxt_command_template,$(command),$(command),$(PXT))))
 
-# Create install rules for each node package
-$(eval $(call _install_node_package_template,makecode-steami,.))
+# Create install rules for each pxt package
 $(foreach target,$(PXT_LIBRARIES),$(eval $(call _install_node_package_template,$(target),$(target))))
 
+.PHONY : install-makecode-steami
+install-makecode-steami: node_modules/.package-lock.json package-lock.json
+	
+node_modules/.package-lock.json package-lock.json:
+	@$(call install_node_package,.)
+
 # Install pxt CLI
-$(PXT) : | install-makecode-steami $(addprefix install-,$(PXT_LIBRARIES)) pxt/built/target.json
+$(PXT) : install-makecode-steami
+
+.NOTPARALLEL : $(PXT) setup
 
 # Build pxt cli
 pxt/built/target.json : pxt/node_modules/.package-lock.json
 	@echo "Build pxt core"
-	cd pxt || exit 
-	npm run build
+	@$(call _build_pxt_core)
+
+.PHONY : build-pxt-core 
+build-pxt-core : install-pxt
+	@echo "Building pxt core ..."
+	$(call _build_pxt_core)
+	@echo "pxt core built"
+
 
 # Create build rule by aliasing pxt buildtarget command
 .PHONY : build

commons.mk

@@ -28,7 +28,7 @@ define deepclean_node_package
 
 endef
 
-define _clean_static
+define _clean_pxt_static_build
 	echo "Clean static build" 
 	$(call _remove_directory_if_exist,static)
 
@@ -45,9 +45,12 @@ define _clean_pxt_steami
 		fi
 	else
 		echo "pxt not found ! \n Manual cleanning"
+		$(call _remove_directory_if_exist,pxt-steami/.pxt)
 		$(call _remove_directory_if_exist,pxt-steami/built)
+		$(call _remove_directory_if_exist,pxt-steami/projects)
 		$(call _remove_directory_if_exist,pxt-steami/libs/core/built)
 		$(call _remove_directory_if_exist,pxt-steami/libs/blocksprj/built)
+		$(call _remove_directory_if_exist,pxt-steami/libs/tsprj/built)
 	fi
 
 endef
@@ -73,13 +76,13 @@ define _clean_pxt_steami_backend_certificates
 endef
 
 define _clean
-	$(call _clean_static)
+	$(call _clean_pxt_static_build)
 	$(call _clean_pxt_steami)
 
 endef
 
 define _clean_all
-	$(call _clean_static)
+	$(call _clean_pxt_static_build)
 	$(call _clean_pxt_steami)
 	$(call _clean_pxt_common_packages)
 	$(call _clean_pxt_core)

pxt.mk

@@ -1,4 +1,5 @@
 PXT_LIBRARIES := pxt pxt-common-packages pxt-steami pxt-steami-backend
+PXT_INSTALL_LIBRARIES := $(addprefix install-,$(PXT_LIBRARIES))
 PXT_COMMANDS := add buildcss buildjres buildsimjs buildsprites buildtarget bump checkdocs checkpkgcfg ci console deploy extract help init install npminstallnative run serve staticpkg tag testghpkgs update usedblocks 
 # Arguments par défaut pour chaque commande PXT
 PXT_ADD_ARGS ?= 
@@ -26,7 +27,7 @@ PXT_TESTGHPKGS_ARGS ?=
 PXT_UPDATE_ARGS ?= 
 PXT_USEDBLOCKS_ARGS ?= 
 
-PXT="/workspaces/makecode-steami/node_modules/.bin/pxt"
+PXT="$(shell pwd)/node_modules/.bin/pxt"
 
 define pxt_command
 	echo "PXT = $(PXT)"
@@ -57,4 +58,10 @@ install-$1: $2/node_modules/.package-lock.json $2/package-lock.json
 $2/node_modules/.package-lock.json $2/package-lock.json: $2/package.json
 	@$$(call install_node_package,$$(<D))
 
+endef
+
+define _build_pxt_core
+	@echo "Build pxt core"
+	cd pxt || exit 
+	npm run build
 endef