Skip to content

Commit ee31a8e

Browse files
ci: fix order of operations and cut over to new test structure
1 parent 16a3772 commit ee31a8e

2 files changed

Lines changed: 10 additions & 261 deletions

File tree

.github/workflows/ci.yml

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,6 @@ jobs:
6363
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
6464
doNotCache: false
6565

66-
- name: Configure
67-
run: cmake --preset "${{ matrix.preset }}"
68-
69-
- name: Build
70-
run: cmake --build --preset "${{ matrix.preset }}" --parallel
71-
72-
- name: Run C++ tests
73-
run: ctest --preset "${{ matrix.preset }}"
74-
7566
- name: Install Python integration deps
7667
if: ${{ matrix.grpc_integration }}
7768
uses: actions/setup-python@v5
@@ -86,26 +77,19 @@ jobs:
8677
python -m pip install --upgrade pip
8778
python -m pip install -r requirements-lock.txt
8879
89-
- name: Run Python gRPC integration
90-
if: ${{ matrix.grpc_integration }}
91-
run: |
92-
bash ./scripts/generate_proto_python.sh
93-
94-
SERVER_BIN="$(find build-server -type f -name fluxgraph-server | head -n 1)"
95-
if [ -z "$SERVER_BIN" ]; then
96-
echo "ERROR: fluxgraph-server binary not found under build-server" >&2
97-
exit 1
98-
fi
80+
- name: Configure
81+
run: cmake --preset "${{ matrix.preset }}"
9982

100-
"$SERVER_BIN" --port 50051 > /tmp/fluxgraph-server.log 2>&1 &
101-
SERVER_PID=$!
102-
trap 'kill $SERVER_PID 2>/dev/null || true' EXIT
103-
sleep 2
83+
- name: Build
84+
run: cmake --build --preset "${{ matrix.preset }}" --parallel
10485

105-
python3 tests/test_grpc_integration.py
86+
- name: Generate Python Protobuf Bindings
87+
if: ${{ matrix.grpc_integration }}
88+
run: |
89+
bash ./scripts/generate_proto_python.sh build-server/python
10690
107-
kill "$SERVER_PID" 2>/dev/null || true
108-
wait "$SERVER_PID" 2>/dev/null || true
91+
- name: Run tests
92+
run: ctest --preset "${{ matrix.preset }}"
10993

11094
windows-core:
11195
name: Windows core-only

tests/test_grpc_integration.py

Lines changed: 0 additions & 235 deletions
This file was deleted.

0 commit comments

Comments
 (0)