From 608366fa3737db782a97216223a22bae3d97239f Mon Sep 17 00:00:00 2001
From: Ben Soares <b.soares@dundee.ac.uk>
Date: Thu, 20 Jun 2024 19:27:41 +0100
Subject: [PATCH] JAL-4409 Use fixed 'latest' artifact URL

---
 build.gradle      |   13 ++++++++-----
 gradle.properties |    6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 217ee28..97a41b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -259,11 +259,14 @@ ext {
     // TODO: get bamboo build artifact URL for getdown artifacts
     getdownChannelName = string("${bamboo_planKey}/${JAVA_VERSION}")
 
-    if (bamboo_buildResultsUrl && bamboo_buildResultsKey) {
-      getdownAppBase = "${bamboo_buildResultsKey}/${bamboo_buildResultsArtifactPath}"
-    } else {
-      getdownAppBase = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}"
-    }
+    /**
+     * This URL doesn't work
+     * if (bamboo_buildResultsUrl && bamboo_buildResultsKey) {
+     *   getdownAppBase = "${bamboo_buildResultsKey}/${bamboo_buildResultsArtifactPath}"
+     * } else {
+     */
+    getdownAppBase = "${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}"
+    /* } */
     jvlChannelName += "_${getdownChannelName}"
     // automatically add the test group Not-bamboo for exclusion 
     if ("".equals(testng_excluded_groups)) { 
diff --git a/gradle.properties b/gradle.properties
index 359f229..35aa95d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -186,9 +186,9 @@ imagemagick_convert = ~/buildtools/imagemagick/bin/convert
 bamboo_channelbase = https://builds.jalview.org/browse
 bamboo_planKey = 
 bamboo_getdown_channel_suffix = /latest/artifact/shared/getdown
-bamboo_buildResultsUrl =
-bamboo_buildResultsArtifactPath = /artifact/shared/getdown
-bamboo_buildResultsKey =
+#bamboo_buildResultsUrl =
+#bamboo_buildResultsArtifactPath = /artifact/shared/getdown
+#bamboo_buildResultsKey =
 
 eclipse_codestyle_file = utils/eclipse/JalviewCodeStyle.xml
 eclipse_extra_jdt_prefs_file = utils/eclipse/org.eclipse.jdt.core.jalview.prefs
-- 
1.7.10.2