Commit db8a0462 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 d8058475

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

+6 −1
Changes for src/main/java/fr/emse/gitlab/saref/managers/RepositoryFactory.java: 6 added lines, 1 removed line.
Original line number Original line Diff line number Diff line
@@ -118,10 +118,15 @@ public class RepositoryFactory extends SAREFErrorLogger { 
			}

			}

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

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





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

			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");

				originalBranch = System.getProperty("CI_COMMIT_REF_NAME");

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

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

			}

			}

			

			final SAREFVersionName originalVersion;

			final SAREFVersionName originalVersion;

			Pattern pattern = Pattern.compile(REGEX_VERSION_BRANCH);

			Pattern pattern = Pattern.compile(REGEX_VERSION_BRANCH);

			Matcher m = pattern.matcher(originalBranch);

			Matcher m = pattern.matcher(originalBranch);