Commit 76bdeb04 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

attempt to use CI branch env variable 

to avoid errors like https://gitlab.emse.fr/saref/repo/saref-core/-/jobs/6593
parent db8a0462

src/main/java/fr/emse/gitlab/saref/Main.java

+3 −3
Original line number Diff line number Diff line
@@ -77,9 +77,9 @@ public class Main { 
					if (CAN_BROWSE)

						Desktop.getDesktop().browse(reportHTML.toURI());

					else {

						String CI_SERVER_HOST = System.getProperty("CI_SERVER_HOST");

						String CI_PROJECT_PATH = System.getProperty("CI_PROJECT_PATH");

						String CI_JOB_ID = System.getProperty("CI_JOB_ID");

						String CI_SERVER_HOST = System.getenv("CI_SERVER_HOST");

						String CI_PROJECT_PATH = System.getenv("CI_PROJECT_PATH");

						String CI_JOB_ID = System.getenv("CI_JOB_ID");

						if (CI_SERVER_HOST == null || CI_PROJECT_PATH == null || CI_JOB_ID == null) {

							System.out.println("\n\n\nSAREF pipeline report:\n" + reportHTML.getCanonicalPath());

						} else {

src/main/java/fr/emse/gitlab/saref/managers/RepositoryFactory.java

+2 −6
Original line number Diff line number Diff line
@@ -118,12 +118,8 @@ public class RepositoryFactory extends SAREFErrorLogger { 
			}

			String originalBranch = git.getRepository().getBranch();



			System.out.println("CI_COMMIT_REF_NAME is set to " + System.getenv("CI_COMMIT_REF_NAME"));



			System.out.println("CI_COMMIT_REF_NAME is set to " + System.getProperty("CI_COMMIT_REF_NAME"));



			if(isTarget && System.getProperty("CI_COMMIT_REF_NAME") != null) {

				originalBranch = System.getProperty("CI_COMMIT_REF_NAME");

			if(isTarget && System.getenv("CI_COMMIT_REF_NAME") != null) {

				originalBranch = System.getenv("CI_COMMIT_REF_NAME");

				System.out.println("CI_COMMIT_REF_NAME is set to " + originalBranch);

			}