Skip to content

Commit 8b5322f

Browse files
committed
Special build-ci target
1 parent 1a9ba54 commit 8b5322f

File tree

3 files changed

+27
-1
lines changed

3 files changed

+27
-1
lines changed

.devcontainer/devcontainer.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"image": "mcr.microsoft.com/devcontainers/cpp:debian-12",
3+
"privileged": true,
4+
"features": {
5+
"ghcr.io/devcontainers/features/git:1": {},
6+
"ghcr.io/devcontainers/features/github-cli:1": {}
7+
},
8+
"customizations": {
9+
"vscode": {
10+
"extensions": [
11+
"jet-propulsion-laboratory.fpp",
12+
"ms-vscode.cpptools",
13+
"ms-vscode.cmake-tools",
14+
"ms-vscode.makefile-tools",
15+
"plorefice.devicetree",
16+
"nordic-semiconductor.nrf-kconfig",
17+
"ms-python.python"
18+
]
19+
}
20+
},
21+
"postCreateCommand": "make"
22+
}

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797

9898
- name: Build
9999
run: |
100-
make build -W submodules -W zephyr-setup -W fprime-venv
100+
make build-ci
101101
102102
- name: Upload build artifacts
103103
uses: actions/upload-artifact@v4

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ build: submodules zephyr-setup fprime-venv generate-if-needed ## Build FPrime-Ze
5656
@echo "Building..."
5757
@$(UV) run fprime-util build
5858

59+
.PHONY: build-ci
60+
build-ci: generate-if-needed
61+
@$(UV) run fprime-util build
62+
5963
.PHONY: test-integration
6064
test-integration:
6165
@$(UV) run pytest FprimeZephyrReference/test/int --deployment build-artifacts/zephyr/fprime-zephyr-deployment

0 commit comments

Comments
 (0)