Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

FROM ubuntu:24.04

ENV DEBIAN_FRONTEND=noninteractive
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: ts=4

# Copyright 2025 Comcast Cable Communications Management, LLC
# Copyright 2026 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -57,7 +57,7 @@ done
[[ -e "$specOpenRpc" ]] || die "OpenRPC spec '$specOpenRpc' not found"
[[ -e "$specAppOpenRpc" ]] || die "OpenRPC App spec '$specAppOpenRpc' not found"
[[ -e "$mockConfig" ]] || die "Config '$mockConfig' not found"
[[ -e "$testExe" ]] || die "Executable for cpp_test '$testExe' not found"
[[ -e "$testExe" ]] || die "Executable '$testExe' not found"

cfgFile=$mockPath/server/src/.mf.config.json

Expand Down Expand Up @@ -93,13 +93,10 @@ while ! nc -z localhost $mockPort >/dev/null 2>&1; do
sleep 1
done

echo "Starting cpp_test with -mock and -auto flags"
echo "Starting '$(basename "$testExe") --mock --auto'"
cd "$(dirname "$testExe")"

# Capture exit code without triggering set -e
set +e
"./$(basename "$testExe")" -mock -auto
"./$(basename "$testExe")" --mock --auto
exitCode=$?
set -e

exit $exitCode
15 changes: 6 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
--app-openrpc /workspace/docs/openrpc/the-spec/firebolt-app-open-rpc.json \
--test-exe /workspace/build/test/ctApp
cpp_demo_tests:
api_test_app:
permissions:
contents: read
packages: read
Expand All @@ -292,7 +292,7 @@ jobs:
name: build-dir
path: ${{ github.workspace }}/build

- name: Build api_test_app standalone
- name: Build api-test-app standalone
run: |
docker run --rm --user "$(id -u):$(id -g)" -v ${{ github.workspace }}:/workspace ${{ needs.build_docker.outputs.image_tag }} \
bash -c " \
Expand All @@ -314,16 +314,13 @@ jobs:
path: ${{ env.MOCK_PATH }}
key: ${{ runner.os }}-mock-${{ steps.setup-mock.outputs.deps_cache_key }}

- name: Run Demo with mock server
- name: Run api-test-app with mock server
run: |
chmod +x ${{ github.workspace }}/test/api_test_app/build/api_test_app
chmod +x ${{ github.workspace }}/test/api_test_app/build/api-test-app
docker run --rm --user "$(id -u):$(id -g)" -v ${{ github.workspace }}:/workspace -v ${{ env.MOCK_PATH }}:/mock ${{ needs.build_docker.outputs.image_tag }} \
./.github/scripts/run-cpp-test.sh \
./.github/scripts/run-api-test-app.sh \
--mock /mock \
--config /workspace/.github/mock-firebolt/config.json \
--openrpc /workspace/docs/openrpc/the-spec/firebolt-open-rpc.json \
--app-openrpc /workspace/docs/openrpc/the-spec/firebolt-app-open-rpc.json \
--test-exe /workspace/test/api_test_app/build/api_test_app
# Removed artifact upload step for api_test_app binary as per PR feedback

--test-exe /workspace/test/api_test_app/build/api-test-app
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,3 @@ endif()
if (ENABLE_TESTS)
add_subdirectory(test)
endif()

71 changes: 0 additions & 71 deletions demo/CMakeLists.txt

This file was deleted.

216 changes: 0 additions & 216 deletions demo/FireboltDemoService.cpp

This file was deleted.

Loading