Commit 13b8e7ff 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 6aae6762

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

+6 −1
Original line number Diff line number Diff line
@@ -116,7 +116,12 @@ public class RepositoryFactory extends SAREFErrorLogger { 
				final String msg = getMessage(MESSAGE.not_clean, project.getName());

				errorLogger.warn(msg);

			}

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

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

			

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

				originalBranch = System.getProperty("CI_COMMIT_BRANCH");

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

			}

			final SAREFVersionName originalVersion;

			Pattern pattern = Pattern.compile(REGEX_VERSION_BRANCH);

			Matcher m = pattern.matcher(originalBranch);