Skip to content

Commit b3bdec5

Browse files
committed
Fix uv cache minimization
1 parent 0173b6d commit b3bdec5

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,4 +108,4 @@ jobs:
108108
retention-days: 30
109109

110110
- name: Minimize uv cache
111-
run: uv cache prune --ci
111+
run: make minimize-uv-cache

Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ generate: submodules fprime-venv zephyr-setup ## Generate FPrime-Zephyr Proves C
4646
@echo "Generating FPrime-Zephyr Proves Core Reference..."
4747
@$(UV) run fprime-util generate --force
4848

49-
.PHONY: generate-ci
50-
generate-ci:
51-
@$(UV) run fprime-util generate --force
52-
5349
.PHONY: generate-if-needed
5450
BUILD_DIR ?= $(shell pwd)/build-fprime-automatic-zephyr
5551
generate-if-needed:
@@ -60,10 +56,6 @@ build: submodules zephyr-setup fprime-venv generate-if-needed ## Build FPrime-Ze
6056
@echo "Building..."
6157
@$(UV) run fprime-util build
6258

63-
.PHONY: build-ci
64-
build-ci:
65-
@$(UV) run fprime-util build
66-
6759
.PHONY: test-integration
6860
test-integration:
6961
@$(UV) run pytest FprimeZephyrReference/test/int --deployment build-artifacts/zephyr/fprime-zephyr-deployment
@@ -109,3 +101,5 @@ UVX ?= $(UV_DIR)/uvx
109101
uv: $(UV) ## Download uv
110102
$(UV): $(BIN_DIR)
111103
@test -s $(UV) || { mkdir -p $(UV_DIR); curl -LsSf https://astral.sh/uv/$(UV_VERSION)/install.sh | UV_INSTALL_DIR=$(UV_DIR) sh > /dev/null; }
104+
105+
include lib/makelib/ci.mk

lib/makelib/ci.mk

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.PHONY: minimize-uv-cache
2+
minimize-uv-cache:
3+
@(UV) cache prune --ci
4+
5+
.PHONY: generate-ci
6+
generate-ci:
7+
@$(UV) run fprime-util generate
8+
9+
.PHONY: build-ci
10+
build-ci:
11+
@$(UV) run fprime-util build

0 commit comments

Comments
 (0)