Skip to content

Commit 474e128

Browse files
authored
macos 15 runner (#47) (#49)
Signed-off-by: Daniel Guns <danbguns@gmail.com>
1 parent 2057c90 commit 474e128

8 files changed

Lines changed: 397 additions & 94 deletions

File tree

Makefile

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.PHONY: help update-flux fetch-crds generate-models clean-models build check test
1+
.PHONY: help update-flux fetch-crds generate-models clean-models build check test ci fmt fmt-check clippy
22

33
help: ## Show this help message
44
@echo "Flux TUI - Build and Maintenance Commands"
@@ -8,36 +8,41 @@ help: ## Show this help message
88
@echo "Targets:"
99
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf " %-20s %s\n", $$1, $$2}'
1010

11-
update-flux: ## Fetch CRDs and generate models (full update)
12-
@./scripts/update-flux.sh
11+
# CI targets (in order they run in CI)
12+
fmt-check: ## Check formatting without modifying files
13+
cargo fmt -- --check
1314

14-
fetch-crds: ## Download Flux CRDs from GitHub releases
15-
@./scripts/fetch-crds.sh
15+
clippy: ## Run clippy linter (with CI flags)
16+
cargo clippy --lib --tests -- -D warnings -A clippy::too_many_arguments -A clippy::items-after-test-module -A clippy::type-complexity -A clippy::should-implement-trait -A renamed_and_removed_lints -A clippy::collapsible-if -A clippy::len-zero -A clippy::assertions-on-constants -A dead-code
1617

17-
generate-models: ## Generate Rust models from CRDs using kopium
18-
@./scripts/generate-models.sh
18+
test: ## Run library and unit tests
19+
cargo test --lib --tests
1920

20-
clean-models: ## Remove generated model files
21-
@echo "Cleaning generated models..."
22-
@rm -rf src/models/_generated/*.rs
23-
@rm -rf crds/*.yaml
24-
@echo "✓ Cleaned"
21+
test-integration: ## Run integration tests
22+
cargo test --test crd_compatibility --test resource_registry --test model_compatibility --test field_extraction --test trace_tests
2523

26-
build: ## Build the project
27-
@cargo build
24+
ci: fmt-check clippy test test-integration ## Run all CI checks in order
2825

29-
check: ## Check the project (without building)
30-
@cargo check
26+
# Build targets
27+
build: ## Build the project (debug)
28+
cargo build
3129

32-
test: ## Run tests
33-
@cargo test
30+
build-release: ## Build the project (release)
31+
cargo build --release
3432

35-
clippy: ## Run clippy linter
36-
@cargo clippy -- -D warnings
33+
check: ## Check the project (without building)
34+
cargo check
3735

36+
# Development helpers
3837
fmt: ## Format code
39-
@cargo fmt
38+
cargo fmt
4039

41-
fmt-check: ## Check formatting without modifying files
42-
@cargo fmt -- --check
40+
# Flux model generation
41+
update-flux: ## Fetch CRDs and generate models (full update)
42+
@./scripts/update-flux.sh
43+
44+
fetch-crds: ## Download Flux CRDs from GitHub releases
45+
@./scripts/fetch-crds.sh
4346

47+
generate-models: ## Generate Rust models from CRDs using kopium
48+
@./scripts/generate-models.sh

0 commit comments

Comments
 (0)