Skip to content

Commit 3b04a81

Browse files
committed
ci(orm): fix standalone build workflow
- Build ORM from modules/orm instead of repo root - Remove non-existent VIX_ORM_USE_MYSQL option - Align CI flags with ORM CMake options - Use proper compiler setup per matrix - Stop masking test failures
1 parent 5aab360 commit 3b04a81

1 file changed

Lines changed: 15 additions & 24 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,34 @@ jobs:
1919
with:
2020
submodules: recursive
2121

22-
- name: Set up ${{ matrix.compiler }}
22+
- name: Install build tools + deps
2323
run: |
24+
sudo apt-get update
25+
sudo apt-get install -y cmake ninja-build
26+
27+
# compilers
2428
if [ "${{ matrix.compiler }}" = "gcc" ]; then
25-
sudo apt-get update
26-
sudo apt-get install -y g++-12
27-
echo "CXX=g++-12" >> $GITHUB_ENV
29+
sudo apt-get install -y gcc-12 g++-12
2830
echo "CC=gcc-12" >> $GITHUB_ENV
31+
echo "CXX=g++-12" >> $GITHUB_ENV
2932
else
30-
sudo apt-get update
3133
sudo apt-get install -y clang
32-
echo "CXX=clang++" >> $GITHUB_ENV
3334
echo "CC=clang" >> $GITHUB_ENV
35+
echo "CXX=clang++" >> $GITHUB_ENV
3436
fi
3537
36-
- name: Install dependencies
37-
run: |
38-
sudo apt-get update
39-
sudo apt-get install -y cmake make ninja-build \
40-
libboost-all-dev \
41-
nlohmann-json3-dev \
42-
libspdlog-dev \
43-
libmysqlcppconn-dev
38+
# optional deps used by orm/db
39+
sudo apt-get install -y libspdlog-dev libmysqlcppconn-dev
4440
45-
- name: Configure (Release)
41+
- name: Configure (Release, ORM standalone)
4642
run: |
47-
cmake -S . -B build -G Ninja \
43+
cmake -S modules/orm -B build -G Ninja \
4844
-DCMAKE_BUILD_TYPE=Release \
49-
-DVIX_BUILD_EXAMPLES=ON \
50-
-DVIX_BUILD_TESTS=ON \
51-
-DVIX_ORM_USE_MYSQL=ON \
52-
-DVIX_ORM_BUILD_EXAMPLES=OFF \
53-
-DVIX_ORM_BUILD_TESTS=OFF
45+
-DVIX_ORM_BUILD_EXAMPLES=ON \
46+
-DVIX_ORM_BUILD_TESTS=ON
5447
5548
- name: Build
5649
run: cmake --build build -j
5750

5851
- name: Run tests
59-
run: |
60-
ctest --test-dir build --output-on-failure || true
61-
52+
run: ctest --test-dir build --output-on-failure

0 commit comments

Comments
 (0)