Skip to content

Commit d0d89ac

Browse files
committed
Removing Things We Don't Need
1 parent e4712a7 commit d0d89ac

File tree

2 files changed

+1
-34
lines changed

2 files changed

+1
-34
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,6 @@ jobs:
2525
submodules: recursive
2626
fetch-depth: 0
2727

28-
# Install only packages NOT pre-installed on ubuntu-latest
29-
# Pre-installed: git, cmake, make, gcc, g++, wget, file, python3
30-
# See: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md
31-
- name: Install minimal Zephyr dependencies
32-
run: |
33-
sudo apt-get update -qq
34-
sudo apt-get install -y --no-install-recommends \
35-
ninja-build \
36-
gperf \
37-
ccache \
38-
device-tree-compiler \
39-
xz-utils \
40-
libmagic1
41-
env:
42-
DEBIAN_FRONTEND: noninteractive
43-
44-
- name: Set up Python
45-
uses: actions/setup-python@v5
46-
with:
47-
python-version: '3.11'
48-
cache: 'pip'
49-
cache-dependency-path: 'requirements.txt'
50-
5128
# Cache both workspace AND SDK together
5229
- name: Cache Zephyr workspace and SDK
5330
id: cache-zephyr
@@ -93,7 +70,7 @@ jobs:
9370
9471
- name: Build for PROVES Flight Control Board v5c
9572
run: |
96-
make build-lite
73+
make build -o zephyr-setup
9774
9875
- name: Upload build artifacts
9976
uses: actions/upload-artifact@v4

Makefile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,11 @@ BUILD_DIR ?= $(shell pwd)/build-fprime-automatic-zephyr
7474
generate-if-needed:
7575
@test -s $(BUILD_DIR) || $(MAKE) generate
7676

77-
.PHONY: generate-lite
78-
generate-lite: submodules fprime-venv ## Generate FPrime-Zephyr Proves Core Reference (lite)
79-
@echo "Generating..."
80-
@$(UV) run fprime-util generate --force
81-
8277
.PHONY: build
8378
build: submodules zephyr-setup fprime-venv generate-if-needed ## Build FPrime-Zephyr Proves Core Reference
8479
@echo "Building..."
8580
@$(UV) run fprime-util build
8681

87-
.PHONY: build-lite
88-
build-lite: fprime-venv generate-lite ## Build FPrime-Zephyr Proves Core Reference (lite)
89-
@echo "Building..."
90-
@$(UV) run fprime-util build
91-
9282
.PHONY: test-integration
9383
test-integration:
9484
@$(UV) run pytest FprimeZephyrReference/test/int --deployment build-artifacts/zephyr/fprime-zephyr-deployment

0 commit comments

Comments
 (0)