fixed nightly CI run with coverage samples

vshaxe · Jan 22, 2025 · bc17168 · bc17168
1 parent 250f3f4
commit bc17168
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
diff --git 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
+-cp ${HAXE_LIBCACHE}/tink_macro/1.0.4/github/08249260f9f6d5c015dd1434ee68d199e960c0d4/src
+-D tink_macro=1.0.4
diff --git 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
diff --git 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
@@ -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([])
 								});
 							});
 						}