NotificationsYou must be signed in to change notification settings
Fork75
Star508

Commitae41110

taylorcyang

committed

bugfix: fix CI errors

1 parent3d073e6 commitae41110Copy full SHA for ae41110

File tree

8 files changed

+28

-25

lines changed

.github/workflows
- coverage.yml
- unit_tests.yml
backend/JavaScriptCore
- JscEngine.cc
src
- foundation.h
- utils
  - MessageQueue.h
test/src

8 files changed

+28

-25

lines changed

`‎.github/workflows/coverage.yml‎`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,14 @@ on:`
`13`	`13`	`jobs:`
`14`	`14`	`coverage-ubuntu-gcc:`
`15`	`15`	`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`
`18`	`17`	`strategy:`
`19`	`18`	`fail-fast:false`
`20`	`19`	`matrix:`
`21`	`20`	`backends:[ V8, JavaScriptCore, QuickJs, Lua ]`
`22`	`21`	`steps:`
`23`	`22`	`-uses:actions/checkout@v4.1.7`
`24`		`- -uses:actions/cache@v4.0.2`
	`23`	`+ -uses:actions/cache@v4`
`25`	`24`	`with:`
`26`	`25`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`27`	`26`	`path:\|`

`‎.github/workflows/unit_tests.yml‎`

Lines changed: 10 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ jobs:`
`25`	`25`	`# - Release`
`26`	`26`	`steps:`
`27`	`27`	`-uses:actions/checkout@v4.1.7`
`28`		`- -uses:actions/cache@v4.0.2`
	`28`	`+ -uses:actions/cache@v4`
`29`	`29`	`with:`
`30`	`30`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`31`	`31`	`path:\|`
`@@ -62,7 +62,7 @@ jobs:`
`62`	`62`	`-Release`
`63`	`63`	`steps:`
`64`	`64`	`-uses:actions/checkout@v4.1.7`
`65`		`- -uses:actions/cache@v4.0.2`
	`65`	`+ -uses:actions/cache@v4`
`66`	`66`	`with:`
`67`	`67`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`68`	`68`	`path:\|`
`@@ -102,8 +102,7 @@ jobs:`
`102`	`102`
`103`	`103`	`ubuntu-gcc-run:`
`104`	`104`	`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`
`107`	`106`	`strategy:`
`108`	`107`	`fail-fast:false`
`109`	`108`	`matrix:`
`@@ -113,7 +112,7 @@ jobs:`
`113`	`112`	`-Release`
`114`	`113`	`steps:`
`115`	`114`	`-uses:actions/checkout@v4.1.7`
`116`		`- -uses:actions/cache@v4.0.2`
	`115`	`+ -uses:actions/cache@v4`
`117`	`116`	`with:`
`118`	`117`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`119`	`118`	`path:\|`
`@@ -140,15 +139,15 @@ jobs:`
`140`	`139`
`141`	`140`	`ubuntu-v8-versions-build:`
`142`	`141`	`timeout-minutes:60`
`143`		`-runs-on:ubuntu-20.04`
	`142`	`+runs-on:ubuntu-latest`
`144`	`143`	`strategy:`
`145`	`144`	`fail-fast:false`
`146`	`145`	`matrix:`
`147`	`146`	`# format index{0 .. index-1}/concurrency`
`148`	`147`	`job_split:[ 0/8, 1/8, 2/8, 3/8, 4/8, 5/8, 6/8, 7/8 ]`
`149`	`148`	`steps:`
`150`	`149`	`-uses:actions/checkout@v4.1.7`
`151`		`- -uses:actions/cache@v4.0.2`
	`150`	`+ -uses:actions/cache@v4`
`152`	`151`	`with:`
`153`	`152`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`154`	`153`	`path:\|`
`@@ -177,7 +176,7 @@ jobs:`
`177`	`176`	`-Release`
`178`	`177`	`steps:`
`179`	`178`	`-uses:actions/checkout@v4.1.7`
`180`		`- -uses:actions/cache@v4.0.2`
	`179`	`+ -uses:actions/cache@v4`
`181`	`180`	`with:`
`182`	`181`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`183`	`182`	`path:\|`
`@@ -206,7 +205,7 @@ jobs:`
`206`	`205`	`strategy:`
`207`	`206`	`fail-fast:false`
`208`	`207`	`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`
`210`	`209`	`steps:`
`211`	`210`	`-uses:actions/checkout@v4.1.7`
`212`	`211`	`-name:Use Node.js ${{ matrix.node-version }}`
`@@ -233,7 +232,7 @@ jobs:`
`233`	`232`	`emscripten-version:[ '4.0.0', '3.1.33' ]`
`234`	`233`	`steps:`
`235`	`234`	`-uses:actions/checkout@v4.1.7`
`236`		`- -uses:actions/cache@v4.0.2`
	`235`	`+ -uses:actions/cache@v4`
`237`	`236`	`with:`
`238`	`237`	`key:ScriptX-UnitTests-Depedencies-${{ hashFiles('test/cmake/**') }}`
`239`	`238`	`path:\|`
`@@ -264,5 +263,4 @@ jobs:`
`264`	`263`	`run:\|`
`265`	`264`	`cd build`
`266`	`265`	`# 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 number	Diff line number	Diff line change
`@@ -28,8 +28,10 @@ JSClassRef JscEngine::externalClass_{};`
`28`	`28`
`29`	`29`	`// When we link against high-version library`
`30`	`30`	`// 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`
`32`	`33`	`bool JscEngine::hasByteBufferAPI_ =reinterpret_cast<void*>(&JSValueGetTypedArrayType) !=nullptr;`
	`34`	`+SCRIPTX_END_INCLUDE_LIBRARY`
`33`	`35`
`34`	`36`	`JscEngine::JscEngine(std::shared_ptr<utils::MessageQueue> mq)`
`35`	`37`	`: messageQueue_(mq ? std::move(mq) : std::make_shared<utils::MessageQueue>()) {`

`‎src/foundation.h‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ struct ImplType {`
`58`	`58`
`59`	`59`	`#ifdef _MSC_VER`
`60`	`60`
`61`		`-// MSVC only support thestandart _Pragma on recent version, use the extension key word here`
	`61`	`+// MSVC only support thestandard _Pragma on recent version, use the extension key word here`
`62`	`62`	`#defineSCRIPTX_BEGIN_INCLUDE_LIBRARY__pragma(warning(push,0))`
`63`	`63`	`#defineSCRIPTX_END_INCLUDE_LIBRARY__pragma(pop)`
`64`	`64`
`@@ -73,10 +73,12 @@ struct ImplType {`
`73`	`73`	`// GCC can't suppress all warnings by -Wall`
`74`	`74`	`// suppress anything encountered explicitly`
`75`	`75`	`// 1. -Wcast-function-type for QuickJs`
	`76`	`+// 2. -Waddress for JSC nullable function symbol`
`76`	`77`
`77`	`78`	`#defineSCRIPTX_BEGIN_INCLUDE_LIBRARY \`
`78`	`79`	`_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic ignored\"-Wall\"") \`
`79`		`- _Pragma("GCC diagnostic ignored\"-Wcast-function-type\"")`
	`80`	`+ _Pragma("GCC diagnostic ignored\"-Wcast-function-type\"") \`
	`81`	`+ _Pragma("GCC diagnostic ignored\"-Waddress\"")`
`80`	`82`
`81`	`83`	`#defineSCRIPTX_END_INCLUDE_LIBRARY_Pragma("GCC diagnostic pop")`
`82`	`84`

`‎src/utils/MessageQueue.h‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@`
`25`	`25`	`#include<functional>`
`26`	`26`	`#include<limits>`
`27`	`27`	`#include<mutex>`
	`28`	`+#include<stdexcept>`
`28`	`29`	`#include<vector>`
`29`	`30`	`#include"../foundation.h"`
`30`	`31`	`#include"MemoryPool.hpp"`

`‎test/src/NativeTest.cc‎`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class TestClass : public ScriptClass {`
`74`	`74`	`static TestClass*create(const Arguments& args) {returnnewTestClass(args.thiz()); }`
`75`	`75`	`};`
`76`	`76`
`77`		`-const ClassDefine<TestClass> TestClassDefAll =`
	`77`	`+staticconst ClassDefine<TestClass> TestClassDefAll =`
`78`	`78`	`defineClass<TestClass>("TestClass")`
`79`	`79`	`.nameSpace("script.engine.test")`
`80`	`80`	`.constructor()`
`@@ -86,14 +86,14 @@ const ClassDefine<TestClass> TestClassDefAll =`
`86`	`86`	`.instanceProperty("src", &TestClass::getSrc, &TestClass::setSrc)`
`87`	`87`	`.build();`
`88`	`88`
`89`		`-const ClassDefine<TestClass> TestClassDefStatic =`
	`89`	`+staticconst ClassDefine<TestClass> TestClassDefStatic =`
`90`	`90`	`defineClass<TestClass>("TestClass")`
`91`	`91`	`.nameSpace("script.engine.test")`
`92`	`92`	`.function("add", &TestClass::add)`
`93`	`93`	`.property("version", &TestClass::getVersion, &TestClass::setVersion)`
`94`	`94`	`.build();`
`95`	`95`
`96`		`-const ClassDefine<TestClass> TestClassDefInstance =`
	`96`	`+staticconst ClassDefine<TestClass> TestClassDefInstance =`
`97`	`97`	`defineClass<TestClass>("TestClass")`
`98`	`98`	`.nameSpace("script.engine.test")`
`99`	`99`	`.constructor(TestClass::create)`
`@@ -664,7 +664,7 @@ class InternalStorageTest : public ScriptClass {`
`664`	`664`	`Local<Value>getVal() {returngetInternalStore().get(0); }`
`665`	`665`	`};`
`666`	`666`
`667`		`-ClassDefine<InternalStorageTest> internalStorageTest =`
	`667`	`+staticClassDefine<InternalStorageTest> internalStorageTest =`
`668`	`668`	`defineClass<InternalStorageTest>("InternalStorageTest")`
`669`	`669`	`.constructor()`
`670`	`670`	`.instanceProperty("val", &InternalStorageTest::getVal, &InternalStorageTest::setVal)`
`@@ -860,7 +860,7 @@ TEST_F(NativeTest, MissMatchedType) {`
`860`	`860`
`861`	`861`	`EngineScopescope(engine);`
`862`	`862`
`863`		`-auto def = defineClass<Instance>("Instance")`
	`863`	`+staticauto def = defineClass<Instance>("Instance")`
`864`	`864`	`.constructor()`
`865`	`865`	`.function("sfun", &Instance::sfun)`
`866`	`866`	`.instanceFunction("fun", &Instance::fun)`
`@@ -1083,7 +1083,7 @@ TEST_F(NativeTest, NativeFounction) {`
`1083`	`1083`	`using ScriptClass::ScriptClass;`
`1084`	`1084`	`};`
`1085`	`1085`
`1086`		`-auto def = defineClass<Instance>("Instance")`
	`1086`	`+staticauto def = defineClass<Instance>("Instance")`
`1087`	`1087`	`.constructor()`
`1088`	`1088`	`.instanceFunction("f", [](Instance*,int) {})`
`1089`	`1089`	`.build();`

`‎test/src/ThreadPoolTest.cc‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include<array>`
`19`	`19`	`#include<atomic>`
	`20`	`+#include<chrono>`
`20`	`21`	`#include<cmath>`
`21`	`22`	`#include<iomanip>`
`22`	`23`	`#include"test.h"`

`‎test/src/ValueTest.cc‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -557,7 +557,7 @@ void testNumber(T value) {`
`557`	`557`	`EXPECT_EQ(num.toInt64(),static_cast<int64_t>(value));`
`558`	`558`	`#endif`
`559`	`559`	`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));`
`561`	`561`	`}`
`562`	`562`
`563`	`563`	`TEST_F(ValueTest, Number) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitae41110

File tree

8 files changed

8 files changed

`‎.github/workflows/coverage.yml‎`

`‎.github/workflows/unit_tests.yml‎`

`‎backend/JavaScriptCore/JscEngine.cc‎`

`‎src/foundation.h‎`

`‎src/utils/MessageQueue.h‎`

`‎test/src/NativeTest.cc‎`

`‎test/src/ThreadPoolTest.cc‎`

`‎test/src/ValueTest.cc‎`

0 commit comments