refactor: centralise testing CI operations into top-level Makefile

Signed-off-by: Jason C. Nucciarone <[email protected]>

.github/workflows/ci.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: python3 -m pip install tox
       - name: Run linters
-        run: tox run -e lint
+        run: make lint
 
   unit-test:
     name: Unit tests
@@ -49,7 +49,7 @@ jobs:
       - name: Install dependencies
         run: python3 -m pip install tox
       - name: Run tests
-        run: tox run -e unit
+        run: make unit
 
   integration-test:
     name: Integration tests

Makefile

@@ -17,20 +17,46 @@ FORMAT_YELLOW = \033[0;33m
 FORMAT_BLUE = \033[0;34m
 FORMAT_END = \033[0m
 
+MUNGECTL := $(CURDIR)/src/mungectl
+define INTEGRATION_TESTS
+	integration-configless
+endef
+
+define mungectl
+	@make -f $(MUNGECTL)/Makefile -C $(MUNGECTL) $(1)
+endef
+
+define slurmhelpers
+	@tox run -e $(1)
+endef
+
 ##@ Build
 
 .PHONY: snap
-snap: ## Build Slurm snap package
-	@snapcraft -v pack
+snap: ## Build snap package
+	snapcraft -v pack
+
+##@ Lint
+
+.PHONY: fmt
+fmt: ## Format snap code
+	@$(call mungectl, "fmt")
+	@$(call slurmhelpers, "fmt")
+
+.PHONY:
+lint: ## Lint snap code
+	@$(call mungectl, "lint")
+	@$(call slurmhelpers, "lint")
 
 ##@ Test
 
-define INTEGRATION_TESTS
-	integration-configless
-endef
+.PHONY: unit
+unit: ## Run snap unit tests
+	@$(call mungectl, "unit")
+	@$(call slurmhelpers, "unit")
 
 .PHONY: integration
-integration: $(INTEGRATION_TESTS) ## Run Slurm integration tests with gambol
+integration: $(INTEGRATION_TESTS) ## Run snap integration tests with gambol
 
 .PHONY: check-snap-exists
 check-snap-exists: