Skip to content

Commit b25d14f

Browse files
author
taylorcyang
committed
bugfix: fix CI errors
1 parent 3d073e6 commit b25d14f

File tree

7 files changed

+19
-18
lines changed

7 files changed

+19
-18
lines changed

.github/workflows/coverage.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,14 @@ on:
1313
jobs:
1414
coverage-ubuntu-gcc:
1515
timeout-minutes: 30
16-
# JavaScriptCore requires libicu66 which is only avaliable on ubuntu-20.04
17-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1817
strategy:
1918
fail-fast: false
2019
matrix:
2120
backends: [ V8, JavaScriptCore, QuickJs, Lua ]
2221
steps:
2322
- uses: actions/checkout@v4.1.7
24-
- uses: actions/cache@v4.0.2
23+
- uses: actions/cache@v4
2524
with:
2625
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
2726
path: |

.github/workflows/unit_tests.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# - Release
2626
steps:
2727
- uses: actions/checkout@v4.1.7
28-
- uses: actions/cache@v4.0.2
28+
- uses: actions/cache@v4
2929
with:
3030
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
3131
path: |
@@ -62,7 +62,7 @@ jobs:
6262
- Release
6363
steps:
6464
- uses: actions/checkout@v4.1.7
65-
- uses: actions/cache@v4.0.2
65+
- uses: actions/cache@v4
6666
with:
6767
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
6868
path: |
@@ -102,8 +102,7 @@ jobs:
102102
103103
ubuntu-gcc-run:
104104
timeout-minutes: 30
105-
# JavaScriptCore requires libicu66 which is only avaliable on ubuntu-20.04
106-
runs-on: ubuntu-20.04
105+
runs-on: ubuntu-latest
107106
strategy:
108107
fail-fast: false
109108
matrix:
@@ -113,7 +112,7 @@ jobs:
113112
- Release
114113
steps:
115114
- uses: actions/checkout@v4.1.7
116-
- uses: actions/cache@v4.0.2
115+
- uses: actions/cache@v4
117116
with:
118117
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
119118
path: |
@@ -140,15 +139,15 @@ jobs:
140139
141140
ubuntu-v8-versions-build:
142141
timeout-minutes: 60
143-
runs-on: ubuntu-20.04
142+
runs-on: ubuntu-latest
144143
strategy:
145144
fail-fast: false
146145
matrix:
147146
# format index{0 .. index-1}/concurrency
148147
job_split: [ 0/8, 1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8 ]
149148
steps:
150149
- uses: actions/checkout@v4.1.7
151-
- uses: actions/cache@v4.0.2
150+
- uses: actions/cache@v4
152151
with:
153152
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
154153
path: |
@@ -177,7 +176,7 @@ jobs:
177176
- Release
178177
steps:
179178
- uses: actions/checkout@v4.1.7
180-
- uses: actions/cache@v4.0.2
179+
- uses: actions/cache@v4
181180
with:
182181
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
183182
path: |
@@ -206,7 +205,7 @@ jobs:
206205
strategy:
207206
fail-fast: false
208207
matrix:
209-
node-version: [ 14.x, 15.x, 16.x, 18.x ] # 19.x
208+
node-version: [ 18.x, 20.x, 22.x ] # 24.x
210209
steps:
211210
- uses: actions/checkout@v4.1.7
212211
- name: Use Node.js ${{ matrix.node-version }}
@@ -233,7 +232,7 @@ jobs:
233232
emscripten-version: [ '4.0.0', '3.1.33' ]
234233
steps:
235234
- uses: actions/checkout@v4.1.7
236-
- uses: actions/cache@v4.0.2
235+
- uses: actions/cache@v4
237236
with:
238237
key: ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}
239238
path: |
@@ -264,5 +263,4 @@ jobs:
264263
run: |
265264
cd build
266265
# exclude failed tests
267-
# --no-experimental-fetch config from https://github.com/emscripten-core/emscripten/issues/16915
268-
node --no-experimental-fetch UnitTests.js '--gtest_filter=-ThreadPool.*:EngineScopeTest.ExitEngine:EngineScopeTest.TwoThreads:EngineScopeTest.ThreadLocal:MessageQueue.Interrupt:MessageQueue.Shutdown:MessageQueue.ShutdownNow:MessageQueue.FullAndPostInsideLoopQueue:ReferenceTest.WeakGc:ReferenceTest.WeakGc:ReferenceTest.GlobalNotClear:ReferenceTest.GlobalOnEngineDestroy:ReferenceTest.WeakOnEngineDestroy:ReferenceTest.WeakNotClrear:ManagedObjectTest.EngineDispose:ManagedObjectTest.FunctionCallback:PressureTest.All:EngineTest.JsPromiseTest:EngineTest.JsPromiseTest2:ShowCaseTest.SetTimeout'
266+
node UnitTests.js '--gtest_filter=-ThreadPool.*:EngineScopeTest.ExitEngine:EngineScopeTest.TwoThreads:EngineScopeTest.ThreadLocal:MessageQueue.Interrupt:MessageQueue.Shutdown:MessageQueue.ShutdownNow:MessageQueue.FullAndPostInsideLoopQueue:ReferenceTest.WeakGc:ReferenceTest.WeakGc:ReferenceTest.GlobalNotClear:ReferenceTest.GlobalOnEngineDestroy:ReferenceTest.WeakOnEngineDestroy:ReferenceTest.WeakNotClrear:ManagedObjectTest.EngineDispose:ManagedObjectTest.FunctionCallback:PressureTest.All:EngineTest.JsPromiseTest:EngineTest.JsPromiseTest2:ShowCaseTest.SetTimeout'

backend/JavaScriptCore/JscEngine.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,10 @@ JSClassRef JscEngine::externalClass_{};
2828

2929
// When we link against high-version library
3030
// but run with a low-version one, macOS/iOS linker just set the undefined symbols to nullptr.
31-
// cast to void* to suppress g++ -Werror=address
31+
// suppress g++ -Werror=address
32+
SCRIPTX_BEGIN_INCLUDE_LIBRARY
3233
bool JscEngine::hasByteBufferAPI_ = reinterpret_cast<void*>(&JSValueGetTypedArrayType) != nullptr;
34+
SCRIPTX_END_INCLUDE_LIBRARY
3335

3436
JscEngine::JscEngine(std::shared_ptr<utils::MessageQueue> mq)
3537
: messageQueue_(mq ? std::move(mq) : std::make_shared<utils::MessageQueue>()) {

src/utils/MessageQueue.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <functional>
2626
#include <limits>
2727
#include <mutex>
28+
#include <stdexcept>
2829
#include <vector>
2930
#include "../foundation.h"
3031
#include "MemoryPool.hpp"

test/src/NativeTest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ TEST_F(NativeTest, MissMatchedType) {
860860

861861
EngineScope scope(engine);
862862

863-
auto def = defineClass<Instance>("Instance")
863+
static auto def = defineClass<Instance>("Instance")
864864
.constructor()
865865
.function("sfun", &Instance::sfun)
866866
.instanceFunction("fun", &Instance::fun)

test/src/ThreadPoolTest.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <array>
1919
#include <atomic>
20+
#include <chrono>
2021
#include <cmath>
2122
#include <iomanip>
2223
#include "test.h"

test/src/ValueTest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,7 +557,7 @@ void testNumber(T value) {
557557
EXPECT_EQ(num.toInt64(), static_cast<int64_t>(value));
558558
#endif
559559
EXPECT_FLOAT_EQ(num.toFloat(), static_cast<float>(value));
560-
EXPECT_FLOAT_EQ(num.toDouble(), static_cast<double>(value));
560+
EXPECT_DOUBLE_EQ(num.toDouble(), static_cast<double>(value));
561561
}
562562

563563
TEST_F(ValueTest, Number) {

0 commit comments

Comments
 (0)