Skip to content

Commit 44069d8

Browse files
srpatchasrpatcha
committed
fix(ci): rewrite simulation-test.yml to fix YAML syntax errors
1 parent 056f5e2 commit 44069d8

4 files changed

Lines changed: 48 additions & 17 deletions

File tree

‎.github/workflows/simulation-test.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ jobs:
6363
run: |
6464
eosim test ${{ matrix.platform }}
6565
echo "✅ ${{ matrix.platform }}: PASSED"
66-
run: eosim test ${{ matrix.platform }}
6766
continue-on-error: true
6867

6968
# ── Cross-platform EoSim validation ───────────────────────────────
@@ -116,12 +115,9 @@ jobs:
116115
cmake --build build -j$(nproc)
117116
- name: Run unit tests
118117
run: cd build && ctest --output-on-failure
119-
- name: Validate EoSim platform
120118
- name: Validate EoS platform
121-
- name: Simulate EoS with validation
122-
eosim test ${{ matrix.platform }}
119+
run: |
123120
eosim test ${{ matrix.platform }}
124-
continue-on-error: true
125121
echo "✅ eApps validated on ${{ matrix.platform }}"
126122
continue-on-error: true
127123

‎cmake/eos.cmake‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
set(CMAKE_SYSTEM_NAME Generic)
2-
set(CMAKE_SYSTEM_PROCESSOR arm)
1+
set(CMAKE_SYSTEM_NAME Linux)
2+
set(CMAKE_SYSTEM_PROCESSOR ${EOS_TARGET_ARCH})
33

4-
set(EOS_TOOLCHAIN_PREFIX "arm-none-eabi-" CACHE STRING "Cross-compiler prefix")
4+
# Allow the compiler to be set from the command line (-DCMAKE_C_COMPILER=...)
5+
if(NOT CMAKE_C_COMPILER)
6+
set(EOS_TOOLCHAIN_PREFIX "arm-none-eabi-" CACHE STRING "Cross-compiler prefix")
7+
set(CMAKE_C_COMPILER "${EOS_TOOLCHAIN_PREFIX}gcc")
8+
set(CMAKE_CXX_COMPILER "${EOS_TOOLCHAIN_PREFIX}g++")
9+
set(CMAKE_ASM_COMPILER "${EOS_TOOLCHAIN_PREFIX}gcc")
10+
set(CMAKE_OBJCOPY "${EOS_TOOLCHAIN_PREFIX}objcopy")
11+
set(CMAKE_SIZE "${EOS_TOOLCHAIN_PREFIX}size")
12+
endif()
513

6-
set(CMAKE_C_COMPILER "${EOS_TOOLCHAIN_PREFIX}gcc")
7-
set(CMAKE_CXX_COMPILER "${EOS_TOOLCHAIN_PREFIX}g++")
8-
set(CMAKE_ASM_COMPILER "${EOS_TOOLCHAIN_PREFIX}gcc")
9-
set(CMAKE_OBJCOPY "${EOS_TOOLCHAIN_PREFIX}objcopy")
10-
set(CMAKE_SIZE "${EOS_TOOLCHAIN_PREFIX}size")
14+
# Skip linker test during compiler check (cross-compilers may lack crt0)
15+
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
1116

12-
set(CMAKE_C_FLAGS_INIT "-mcpu=cortex-a53 -mthumb -ffunction-sections -fdata-sections -fno-common")
13-
set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--gc-sections -specs=nosys.specs")
17+
set(CMAKE_C_FLAGS_INIT "-ffunction-sections -fdata-sections -fno-common")
18+
set(CMAKE_EXE_LINKER_FLAGS_INIT "-Wl,--gc-sections")
1419

1520
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
1621
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)

‎core/common/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,4 @@ target_include_directories(eapps_common PUBLIC
1212

1313
if(NOT MSVC)
1414
target_link_libraries(eapps_common PRIVATE m)
15-
endif()
16-
target_link_libraries(eapps_common PRIVATE m)
1715
endif()

‎port/web/shell.html‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>eApps</title>
7+
<style>
8+
* { margin: 0; padding: 0; }
9+
body { background: #222; display: flex; justify-content: center; align-items: center; height: 100vh; }
10+
canvas.emscripten { border: 1px solid #444; }
11+
#status { color: #ccc; font-family: sans-serif; text-align: center; margin-top: 8px; }
12+
</style>
13+
</head>
14+
<body>
15+
<div>
16+
<canvas class="emscripten" id="canvas" tabindex="-1"></canvas>
17+
<div id="status">Loading…</div>
18+
</div>
19+
<script>
20+
var Module = {
21+
canvas: (function() { return document.getElementById('canvas'); })(),
22+
setStatus: function(text) {
23+
document.getElementById('status').textContent = text;
24+
},
25+
onRuntimeInitialized: function() {
26+
document.getElementById('status').textContent = '';
27+
}
28+
};
29+
</script>
30+
{{{ SCRIPT }}}
31+
</body>
32+
</html>

0 commit comments

Comments
 (0)