test submodules ignore only in dev

vga91 · vga91 · commit b2d416a13141 · 2023-12-18T10:49:48.000+01:00
diff --git a/extended/build.gradle b/extended/build.gradle
@@ -46,7 +46,7 @@ shadowJar {
 // to init the submodule in case of new submodule or refresh it if exists, every time we compile 
 task gitSubmoduleLoad {
     def execute = ["bash", "-c", "git submodule status apoc-core | grep -q \"^-\" && rm -r apoc-core && git submodule update --init apoc-core || git submodule update --remote apoc-core; " +
-            "git update-index --assume-unchanged apoc-core"]
+            "git config --file .gitmodules --get submodule.apoc-core.branch | grep -wq 'dev' && git update-index --assume-unchanged apoc-core || git update-index --assume-unchanged apoc-core"]
             .execute()
     execute.waitForProcessOutput(System.out, System.err)
 }
diff --git a/init.gradle b/init.gradle
@@ -1,6 +1,6 @@
 initscript {
     def execute = ["bash", "-c", "rm -r apoc-core && git submodule update --init apoc-core; " +
-            "git update-index --assume-unchanged apoc-core"]
+            "git config --file .gitmodules --get submodule.apoc-core.branch | grep -wq 'dev' && git update-index --assume-unchanged apoc-core || git update-index --assume-unchanged apoc-core"]
             .execute()
     execute.waitForProcessOutput(System.out, System.err)
 }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ shadowJar {`
`46`	`46`	`// to init the submodule in case of new submodule or refresh it if exists, every time we compile`
`47`	`47`	`task gitSubmoduleLoad {`
`48`	`48`	`def execute = ["bash", "-c", "git submodule status apoc-core \| grep -q \"^-\" && rm -r apoc-core && git submodule update --init apoc-core \|\| git submodule update --remote apoc-core; " +`
`49`		`- "git update-index --assume-unchanged apoc-core"]`
	`49`	`+ "git config --file .gitmodules --get submodule.apoc-core.branch \| grep -wq 'dev' && git update-index --assume-unchanged apoc-core \|\| git update-index --assume-unchanged apoc-core"]`
`50`	`50`	`.execute()`
`51`	`51`	`execute.waitForProcessOutput(System.out, System.err)`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`initscript {`
`2`	`2`	`def execute = ["bash", "-c", "rm -r apoc-core && git submodule update --init apoc-core; " +`
`3`		`- "git update-index --assume-unchanged apoc-core"]`
	`3`	`+ "git config --file .gitmodules --get submodule.apoc-core.branch \| grep -wq 'dev' && git update-index --assume-unchanged apoc-core \|\| git update-index --assume-unchanged apoc-core"]`
`4`	`4`	`.execute()`
`5`	`5`	`execute.waitForProcessOutput(System.out, System.err)`
`6`	`6`	`}`