From bc17168d5cbc68a8303bf8208e0447262acd80dd Mon Sep 17 00:00:00 2001 From: AlexHaxe Date: Wed, 22 Jan 2025 22:55:49 +0100 Subject: [PATCH] fixed nightly CI run with coverage samples --- .github/workflows/coverage.yml | 2 +- .github/workflows/main.yml | 2 +- samples/buddy-instrument/haxe_libraries/json2object.hxml | 4 ++-- samples/munit-instrument/haxe_libraries/munit.hxml | 6 ++---- samples/munit-mcover/haxe_libraries/mcover.hxml | 4 ++-- samples/munit-mcover/haxe_libraries/munit.hxml | 6 ++---- .../haxe_libraries/json2object.hxml | 4 ++-- .../tink_unittest-instrument/haxe_libraries/tink_macro.hxml | 6 +++--- samples/utest-instrument/haxe_libraries/json2object.hxml | 4 ++-- test-adapter/_testadapter/buddy/Injector.hx | 2 +- test-adapter/_testadapter/tink_unittest/Injector.hx | 2 +- 11 files changed, 19 insertions(+), 23 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 60ed25a..2adebc5 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -1,4 +1,4 @@ -name: CI +name: samples with coverage on: push: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1f03b0a..d2dd62e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CI +name: samples (no coverage) on: push: diff --git a/samples/buddy-instrument/haxe_libraries/json2object.hxml b/samples/buddy-instrument/haxe_libraries/json2object.hxml index 897b5a3..5ed25d9 100644 --- a/samples/buddy-instrument/haxe_libraries/json2object.hxml +++ b/samples/buddy-instrument/haxe_libraries/json2object.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib +# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60 -lib hxjsonast --cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src +-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src -D json2object=3.11.0 \ No newline at end of file diff --git a/samples/munit-instrument/haxe_libraries/munit.hxml b/samples/munit-instrument/haxe_libraries/munit.hxml index 028b909..6ae392d 100644 --- a/samples/munit-instrument/haxe_libraries/munit.hxml +++ b/samples/munit-instrument/haxe_libraries/munit.hxml @@ -1,6 +1,4 @@ -# @install: lix --silent download "haxelib:/munit#2.3.5" into munit/2.3.5/haxelib -# @run: haxelib run-dir munit "${HAXE_LIBCACHE}/munit/2.3.5/haxelib" --lib mcover +# @install: lix --silent download "gh://github.com/AlexHaxe/MassiveUnit#5d964248de93dc97de34e1e9c05e0fd59377c1e5" into MassiveUnit/0.0.0/github/5d964248de93dc97de34e1e9c05e0fd59377c1e5 -lib mlib --cp ${HAXE_LIBCACHE}/munit/2.3.5/haxelib/ +-cp ${HAXE_LIBCACHE}/MassiveUnit/0.0.0/github/5d964248de93dc97de34e1e9c05e0fd59377c1e5/src -D munit=2.3.5 \ No newline at end of file diff --git a/samples/munit-mcover/haxe_libraries/mcover.hxml b/samples/munit-mcover/haxe_libraries/mcover.hxml index 6e52035..ca065da 100644 --- a/samples/munit-mcover/haxe_libraries/mcover.hxml +++ b/samples/munit-mcover/haxe_libraries/mcover.hxml @@ -1,3 +1,3 @@ -# @install: lix --silent download "gh://github.com/AlexHaxe/mcover#fdbdbc11938eabf068b40e30e8b8b16912f8da6c" into mcover/0.0.0/github/fdbdbc11938eabf068b40e30e8b8b16912f8da6c --cp ${HAXE_LIBCACHE}/mcover/0.0.0/github/fdbdbc11938eabf068b40e30e8b8b16912f8da6c/src +# @install: lix --silent download "gh://github.com/AlexHaxe/mcover#263b0aff3280a406102d8cb6e9b1f614492e559a" into mcover/0.0.0/github/263b0aff3280a406102d8cb6e9b1f614492e559a +-cp ${HAXE_LIBCACHE}/mcover/0.0.0/github/263b0aff3280a406102d8cb6e9b1f614492e559a/src -D mcover=0.0.0 \ No newline at end of file diff --git a/samples/munit-mcover/haxe_libraries/munit.hxml b/samples/munit-mcover/haxe_libraries/munit.hxml index 028b909..6ae392d 100644 --- a/samples/munit-mcover/haxe_libraries/munit.hxml +++ b/samples/munit-mcover/haxe_libraries/munit.hxml @@ -1,6 +1,4 @@ -# @install: lix --silent download "haxelib:/munit#2.3.5" into munit/2.3.5/haxelib -# @run: haxelib run-dir munit "${HAXE_LIBCACHE}/munit/2.3.5/haxelib" --lib mcover +# @install: lix --silent download "gh://github.com/AlexHaxe/MassiveUnit#5d964248de93dc97de34e1e9c05e0fd59377c1e5" into MassiveUnit/0.0.0/github/5d964248de93dc97de34e1e9c05e0fd59377c1e5 -lib mlib --cp ${HAXE_LIBCACHE}/munit/2.3.5/haxelib/ +-cp ${HAXE_LIBCACHE}/MassiveUnit/0.0.0/github/5d964248de93dc97de34e1e9c05e0fd59377c1e5/src -D munit=2.3.5 \ No newline at end of file diff --git a/samples/tink_unittest-instrument/haxe_libraries/json2object.hxml b/samples/tink_unittest-instrument/haxe_libraries/json2object.hxml index 897b5a3..5ed25d9 100644 --- a/samples/tink_unittest-instrument/haxe_libraries/json2object.hxml +++ b/samples/tink_unittest-instrument/haxe_libraries/json2object.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib +# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60 -lib hxjsonast --cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src +-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src -D json2object=3.11.0 \ No newline at end of file diff --git a/samples/tink_unittest-instrument/haxe_libraries/tink_macro.hxml b/samples/tink_unittest-instrument/haxe_libraries/tink_macro.hxml index 046e3c4..722cd73 100644 --- a/samples/tink_unittest-instrument/haxe_libraries/tink_macro.hxml +++ b/samples/tink_unittest-instrument/haxe_libraries/tink_macro.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "haxelib:/tink_macro#1.0.3" into tink_macro/1.0.3/haxelib +# @install: lix --silent download "gh://github.com/haxetink/tink_macro#08249260f9f6d5c015dd1434ee68d199e960c0d4" into tink_macro/1.0.4/github/08249260f9f6d5c015dd1434ee68d199e960c0d4 -lib tink_core --cp ${HAXE_LIBCACHE}/tink_macro/1.0.3/haxelib/src --D tink_macro=1.0.3 \ No newline at end of file +-cp ${HAXE_LIBCACHE}/tink_macro/1.0.4/github/08249260f9f6d5c015dd1434ee68d199e960c0d4/src +-D tink_macro=1.0.4 \ No newline at end of file diff --git a/samples/utest-instrument/haxe_libraries/json2object.hxml b/samples/utest-instrument/haxe_libraries/json2object.hxml index 897b5a3..5ed25d9 100644 --- a/samples/utest-instrument/haxe_libraries/json2object.hxml +++ b/samples/utest-instrument/haxe_libraries/json2object.hxml @@ -1,4 +1,4 @@ -# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib +# @install: lix --silent download "gh://github.com/elnabo/json2object#a75859de1e966c09e73591b6c9186086c143fe60" into json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60 -lib hxjsonast --cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src +-cp ${HAXE_LIBCACHE}/json2object/3.11.0/github/a75859de1e966c09e73591b6c9186086c143fe60/src -D json2object=3.11.0 \ No newline at end of file diff --git a/test-adapter/_testadapter/buddy/Injector.hx b/test-adapter/_testadapter/buddy/Injector.hx index 166d87d..9bd8b0e 100644 --- a/test-adapter/_testadapter/buddy/Injector.hx +++ b/test-adapter/_testadapter/buddy/Injector.hx @@ -38,7 +38,7 @@ class Injector { beforeEachStack = beforeEachStack.copy(); beforeEachStack.unshift([Sync(() -> instrument.coverage.Coverage.resetAttributableCoverage())]); afterEachStack = afterEachStack.copy(); - var testCaseName:LCOVFileName = '${suiteId}.$description.lcov'; + var testCaseName:_testadapter.data.Data.LCOVFileName = '${suiteId}.$description.lcov'; var path = haxe.io.Path.join([$v{baseFolder}, testCaseName]); var lcovReporter = new instrument.coverage.reporter.LcovCoverageReporter(path); afterEachStack.unshift([ diff --git a/test-adapter/_testadapter/tink_unittest/Injector.hx b/test-adapter/_testadapter/tink_unittest/Injector.hx index a0cca26..13769c0 100644 --- a/test-adapter/_testadapter/tink_unittest/Injector.hx +++ b/test-adapter/_testadapter/tink_unittest/Injector.hx @@ -28,7 +28,7 @@ class Injector { return Future.async(function(cb) { cb({ info: caze.info, - result: tink.testrunner.CaseResultType.Succeeded([]) + result: tink.testrunner.Result.CaseResultType.Succeeded([]) }); }); }