From acbce3dcc26a3ea6ec693ffacffc78f794ef0eb5 Mon Sep 17 00:00:00 2001 From: Tiger Oakes Date: Fri, 7 Aug 2020 15:39:06 -0700 Subject: [PATCH] Closes #13404: Update github checks URL (#13407) --- build.gradle | 6 +++--- .../mozilla/fenix/gradle/tasks/GithubDetailsTask.kt | 13 ++----------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/build.gradle b/build.gradle index 9f00fff0f..a236dc191 100644 --- a/build.gradle +++ b/build.gradle @@ -190,13 +190,13 @@ tasks.register("listRepositories") { } tasks.register("githubTestDetails", GithubDetailsTask) { - text = "### [Unit Test Results](/reports/test/testGeckoNightlyDebugUnitTest/index.html)" + text = "### [Unit Test Results]({reportsUrl}/test/testDebugUnitTest/index.html)" } tasks.register("githubLintDetektDetails", GithubDetailsTask) { - text = "### [Detekt Results](/reports/detekt.html)" + text = "### [Detekt Results]({reportsUrl}/detekt.html)" } tasks.register("githubLintAndroidDetails", GithubDetailsTask) { - text = "### [Android Lint Results](/reports/lint-results-geckoNightlyDebug.html)" + text = "### [Android Lint Results]({reportsUrl}/lint-results-geckoNightlyDebug.html)" } diff --git a/buildSrc/src/main/java/org/mozilla/fenix/gradle/tasks/GithubDetailsTask.kt b/buildSrc/src/main/java/org/mozilla/fenix/gradle/tasks/GithubDetailsTask.kt index 33ca353f6..16dccbcce 100644 --- a/buildSrc/src/main/java/org/mozilla/fenix/gradle/tasks/GithubDetailsTask.kt +++ b/buildSrc/src/main/java/org/mozilla/fenix/gradle/tasks/GithubDetailsTask.kt @@ -26,20 +26,11 @@ open class GithubDetailsTask : DefaultTask() { private val detailsFile = File("/builds/worker/github/customCheckRunText.md") private val suffix = "\n\n_(404 if compilation failed)_" - /** - * Captures the link name and URL in a markdown link. - * i.e. "### [Hello](/world.html)" -> "/world.html" - */ - private val markdownLinkRegex = """\[(.*)]\((.*)\)""".toRegex() - @TaskAction fun writeFile() { val taskId = System.getenv("TASK_ID") - val url = "https://firefoxci.taskcluster-artifacts.net/$taskId/0/public" - val replaced = text.replace(markdownLinkRegex) { match -> - val (_, linkName, linkUrl) = match.groupValues - "[$linkName](${url + linkUrl})" - } + val reportsUrl = "https://firefoxci.taskcluster-artifacts.net/$taskId/0/public/reports" + val replaced = text.replace("{reportsUrl}", reportsUrl) project.mkdir("/builds/worker/github") detailsFile.writeText(replaced + suffix)