From 8e71e1026102bba6e57980e428ce7aef40aed923 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maxime=20Lefran=C3=A7ois?= Date: Sat, 13 Jun 2020 21:47:07 +0200 Subject: [PATCH] pipeline, snapshot, staging --- src/main/java/fr/emse/gitlab/saref/Main.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/emse/gitlab/saref/Main.java b/src/main/java/fr/emse/gitlab/saref/Main.java index 202f19d..08b803f 100644 --- a/src/main/java/fr/emse/gitlab/saref/Main.java +++ b/src/main/java/fr/emse/gitlab/saref/Main.java @@ -55,8 +55,8 @@ public class Main { private static final String CI_SERVER_HOST = System.getenv("CI_SERVER_HOST"); private static final String CI_PROJECT_PATH = System.getenv("CI_PROJECT_PATH"); - private static final String CI_JOB_ID = System.getenv("CI_JOB_ID"); - private static final boolean isGitLabCI = CI_SERVER_HOST != null && CI_PROJECT_PATH != null && CI_JOB_ID != null; + private static final String CI_PIPELINE_ID = System.getenv("CI_PIPELINE_ID"); + private static final boolean isGitLabCI = CI_SERVER_HOST != null && CI_PROJECT_PATH != null && CI_PIPELINE_ID != null; public static void main(String[] args) { if (args.length == 0 && !GraphicsEnvironment.isHeadless()) { @@ -86,7 +86,12 @@ public class Main { if (CAN_BROWSE) Desktop.getDesktop().browse(reportHTML.toURI()); else if (isGitLabCI) { - String link = String.format("%sjobs/%s/report.html", SAREF.BASE, CI_JOB_ID); + String link; + if(pipeline.mode == Mode.DEVELOP || pipeline.mode == Mode.RELEASE) { + link = String.format("%ssnapshot/%s/report.html", SAREF.BASE, CI_PIPELINE_ID); + } else { + link = String.format("%sstaging/%s/report.html", SAREF.BASE, CI_PIPELINE_ID); + } System.out.println("\n\n\nSAREF pipeline HTML report:\n" + link); } else { System.out.println("\n\n\nSAREF pipeline HTML report:\n" + reportHTML.getCanonicalPath()); @@ -102,15 +107,18 @@ public class Main { if (CAN_BROWSE) { Desktop.getDesktop().browse(documentationHTML.toURI()); } else if (isGitLabCI) { - String link = String.format("%sjobs/%s/%s/%s/%s.html", SAREF.BASE, CI_JOB_ID, target.getRepository().getProject().getPath(), - target.getCurrentVersionName(), - target.getRepository().getProject().getOntologyFileName()); + String link = String.format("%ssnapshot/%s/%s/%s/%s.html", SAREF.BASE, CI_PIPELINE_ID, target.getRepository().getProject().getPath(), + target.getCurrentVersionName(), + target.getRepository().getProject().getOntologyFileName()); System.out.println("\n\n\nHTML documentation:\n" + link); } else { System.out.println(String.format("\nDocumentation for %s %s: %s\n", target.getRepository().getProject(), target.getCurrentVersionName(), documentationHTML.getCanonicalPath())); } + } else { + String link = String.format("%sstaging/%s/", SAREF.BASE, CI_PIPELINE_ID); + System.out.println("\n\n\nHTML documentation:\n" + link); } } } -- 2.18.1