[98] Check pull_request event to launch tests on CI

Add a trigger for launch tests when event is "pull_request". Bug: cea-hpc#98 Signed-off-by: Vincent Blain <[email protected]>
vblainobeo · Oct 14, 2022 · a5b99f8 · a5b99f8
1 parent 9748989
commit a5b99f8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/tests/fr.cea.nabla.tests/src/fr/cea/nabla/tests/GitCommitMessageTest.xtend b/tests/fr.cea.nabla.tests/src/fr/cea/nabla/tests/GitCommitMessageTest.xtend
@@ -101,7 +101,7 @@ class GitCommitMessageTest
 	@Test
 	def void testTitle()
 	{
-		Assume.assumeTrue(testUtils.runningOnCI())
+		Assume.assumeTrue(testUtils.isPush())
 		val lines = this.runCommand()
 		Assertions.assertThat(lines.size()).isGreaterThan(5)
 
@@ -131,7 +131,7 @@ class GitCommitMessageTest
 	@Test
 	def void testSignedOffBy()
 	{
-		Assume.assumeTrue(testUtils.runningOnCI())
+		Assume.assumeTrue(testUtils.isPush())
 		val lines = this.runCommand()
 		Assertions.assertThat(lines).filteredOn(line | line.trim().startsWith(SIGNED_OFF_BY_PREFIX)).isNotEmpty()
 	}

diff --git a/tests/fr.cea.nabla.tests/src/fr/cea/nabla/tests/TestUtils.xtend b/tests/fr.cea.nabla.tests/src/fr/cea/nabla/tests/TestUtils.xtend
@@ -40,10 +40,19 @@ class TestUtils
 
 	def runningOnCI()
 	{
-		val event = System.getenv("GITHUB_EVENT_NAME") //$NON-NLS-1$
-		//System.out.println(event)
+		return isPush() || isPullRequest()
+	}
 
-		return System.getenv("CI") !== null && event.equals("push") //$NON-NLS-1$ //$NON-NLS-2$
+	def isPush()
+	{
+		val event = System.getenv("GITHUB_EVENT_NAME") // $NON-NLS-1$
+		return System.getenv("CI") !== null && event.equals("push") // $NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	def isPullRequest()
+	{
+		val event = System.getenv("GITHUB_EVENT_NAME") // $NON-NLS-1$
+		return System.getenv("CI") !== null && event.equals("pull_request") // $NON-NLS-1$ //$NON-NLS-2$
 	}
 
 	def getAllAffectations(EObject it)