diff --git a/.github/workflows/mineunit.yml b/.github/workflows/mineunit.yml index 0c4b1e9d..8fa6a72f 100644 --- a/.github/workflows/mineunit.yml +++ b/.github/workflows/mineunit.yml @@ -80,7 +80,11 @@ jobs: comment: |
Mineunit failed regression tests, click for details - ### Regression test log for technic: + ### Regression test log for Technic CNC: + ``` + ${{ steps.mineunit-cnc.outputs.mineunit-stdout }} + ``` + ### Regression test log for Technic: ``` ${{ steps.mineunit.outputs.mineunit-stdout }} ``` diff --git a/technic/spec/fixtures/pipeworks.lua b/technic/spec/fixtures/pipeworks.lua index 8eae6f89..cebab94d 100644 --- a/technic/spec/fixtures/pipeworks.lua +++ b/technic/spec/fixtures/pipeworks.lua @@ -1,3 +1,4 @@ +mineunit:set_modpath("pipeworks", "spec/fixtures") _G.pipeworks = {} _G.pipeworks.button_label = "" diff --git a/technic_cnc/spec/fixtures/basic_materials.lua b/technic_cnc/spec/fixtures/basic_materials.lua index c59f879c..81b74d92 100644 --- a/technic_cnc/spec/fixtures/basic_materials.lua +++ b/technic_cnc/spec/fixtures/basic_materials.lua @@ -1,3 +1,4 @@ +mineunit:set_modpath("basic_materials", "spec/fixtures") minetest.register_node(":basic_materials:concrete_block", { description = "Mineunit concrete_block", diff --git a/technic_cnc/spec/fixtures/default.lua b/technic_cnc/spec/fixtures/default.lua index 9515805c..30e11ee6 100644 --- a/technic_cnc/spec/fixtures/default.lua +++ b/technic_cnc/spec/fixtures/default.lua @@ -1,3 +1,4 @@ +mineunit:set_modpath("default", "spec/fixtures") minetest.register_node(":default:stone", { description = "Mineunit stone", diff --git a/technic_cnc/spec/fixtures/digilines.lua b/technic_cnc/spec/fixtures/digilines.lua index e7be4752..7fc419d9 100644 --- a/technic_cnc/spec/fixtures/digilines.lua +++ b/technic_cnc/spec/fixtures/digilines.lua @@ -1,5 +1,5 @@ -mineunit:set_modpath("digilines", "fixtures") +mineunit:set_modpath("digilines", "spec/fixtures") _G.digilines = { _msg_log = {}, diff --git a/technic_cnc/spec/fixtures/pipeworks.lua b/technic_cnc/spec/fixtures/pipeworks.lua index 1498b7c9..c5070162 100644 --- a/technic_cnc/spec/fixtures/pipeworks.lua +++ b/technic_cnc/spec/fixtures/pipeworks.lua @@ -1,5 +1,5 @@ -mineunit:set_modpath("pipeworks", "fixtures") +mineunit:set_modpath("pipeworks", "spec/fixtures") _G.pipeworks = { fs_helpers = { diff --git a/technic_cnc/spec/fixtures/technic.lua b/technic_cnc/spec/fixtures/technic.lua deleted file mode 100644 index e4069a03..00000000 --- a/technic_cnc/spec/fixtures/technic.lua +++ /dev/null @@ -1,28 +0,0 @@ - -mineunit:set_modpath("technic", "../technic") - -_G.technic = { - modpath = minetest.get_modpath("technic"), - digilines = { - rules = { - -- digilines.rules.default - {x= 1,y= 0,z= 0},{x=-1,y= 0,z= 0}, -- along x beside - {x= 0,y= 0,z= 1},{x= 0,y= 0,z=-1}, -- along z beside - {x= 1,y= 1,z= 0},{x=-1,y= 1,z= 0}, -- 1 node above along x diagonal - {x= 0,y= 1,z= 1},{x= 0,y= 1,z=-1}, -- 1 node above along z diagonal - {x= 1,y=-1,z= 0},{x=-1,y=-1,z= 0}, -- 1 node below along x diagonal - {x= 0,y=-1,z= 1},{x= 0,y=-1,z=-1}, -- 1 node below along z diagonal - -- added rules for digi cable - {x = 0, y = -1, z = 0}, -- along y below - } - } -} - -mineunit:set_current_modname("technic") - -sourcefile("../technic/config") -sourcefile("../technic/helpers") -sourcefile("../technic/register") -sourcefile("../technic/machines/register/common") - -mineunit:restore_current_modname() diff --git a/technic_cnc/spec/interaction_spec.lua b/technic_cnc/spec/interaction_spec.lua index ebb6b945..e559cb0f 100644 --- a/technic_cnc/spec/interaction_spec.lua +++ b/technic_cnc/spec/interaction_spec.lua @@ -9,9 +9,6 @@ describe("CNC formspec interaction", function() fixture("default") fixture("basic_materials") fixture("pipeworks") - -- Technic cannot be used for production without building complete technic network. - -- Running tests like that here might get too complicated thing to manage here. - --fixture("technic") fixture("digilines") sourcefile("init")