Skip to content

Commit 80497a9

Browse files
authored
Merge branch 'main' into codex/add-reproducible-dev-environment-setup
2 parents e284bf4 + 0d817ed commit 80497a9

23 files changed

Lines changed: 1736 additions & 95 deletions

.github/workflows/host-tests.yml

Lines changed: 43 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,52 @@
11
name: Host Tests
22

3-
on: [pull_request, push]
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
47

58
jobs:
69
tests:
710
runs-on: ubuntu-latest
11+
timeout-minutes: 25
12+
813
steps:
914
- uses: actions/checkout@v4
10-
- name: CMake toolchain
11-
uses: aminya/setup-cpp@v1
12-
with: { compiler: llvm, cmake: true }
13-
- name: Build & Run
15+
16+
# Install build tools and GTest
17+
- name: Install deps
18+
run: |
19+
sudo apt-get update
20+
sudo apt-get install -y ninja-build cmake ccache libgtest-dev
21+
# Build GTest libs (headers are already present)
22+
sudo cmake -S /usr/src/googletest -B /usr/src/googletest/build
23+
sudo cmake --build /usr/src/googletest/build -j
24+
sudo cp -a /usr/src/googletest/build/lib/* /usr/local/lib/
25+
26+
- name: Cache ccache
27+
uses: actions/cache@v4
28+
with:
29+
path: ~/.cache/ccache
30+
key: ccache-host-${{ runner.os }}-${{ hashFiles('**/CMakeLists.txt', 'custom/**', 'tests/**') }}
31+
restore-keys: |
32+
ccache-host-${{ runner.os }}-
33+
34+
- name: Configure (Ninja + ccache + unity)
35+
env:
36+
CCACHE_DIR: ~/.cache/ccache
1437
run: |
15-
make test
16-
./tools/check_secrets.sh
38+
cmake -S tests -B tests/build \
39+
-G Ninja \
40+
-DCMAKE_UNITY_BUILD=ON \
41+
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
42+
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
43+
-DROMS_ONLY=ON
44+
45+
- name: Build rooms_page_test
46+
run: cmake --build tests/build --target rooms_page_test -j
47+
48+
- name: Run tests
49+
run: ctest --test-dir tests/build --output-on-failure --timeout 60
50+
51+
- name: Secret scan
52+
run: ./tools/check_secrets.sh

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ dependencies
77
# Generated LVGL image blobs (runtime PNGs load from filesystem)
88
custom/assets/bg/*.c
99
custom/assets/bg/*.h
10+
tests/ui/output/

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Changelog
22

3+
## [1.3.0](https://github.com/baba-dev/M5Tab5-UserDemo/compare/v1.2.0...v1.3.0) (2025-09-18)
4+
5+
6+
### Features
7+
8+
* **ui:** add rooms page grid and tests ([bb91c7a](https://github.com/baba-dev/M5Tab5-UserDemo/commit/bb91c7aae869c5327eb88a9307e2b6931510a40c))
9+
10+
11+
### Bug Fixes
12+
13+
* **desktop:** guard SDL helpers when disabled ([8128299](https://github.com/baba-dev/M5Tab5-UserDemo/commit/81282994a57cdaa837ea068129c7f4cdad1e7e9e))
14+
315
## [1.2.0](https://github.com/baba-dev/M5Tab5-UserDemo/compare/v1.1.1...v1.2.0) (2025-09-18)
416

517

CMakePresets.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"version": 5,
3+
"configurePresets": [
4+
{
5+
"name": "tests-ninja-fast",
6+
"displayName": "Host tests (Ninja/ccache/unity)",
7+
"generator": "Ninja",
8+
"binaryDir": "${sourceDir}/tests/build",
9+
"cacheVariables": {
10+
"CMAKE_UNITY_BUILD": "ON",
11+
"CMAKE_C_COMPILER_LAUNCHER": "ccache",
12+
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
13+
"ROMS_ONLY": "ON"
14+
}
15+
}
16+
]
17+
}

0 commit comments

Comments
 (0)