From a3ebd530abdc3f1d2d55f88245a4727b4d428c01 Mon Sep 17 00:00:00 2001
From: Norman Walsh <ndw@nwalsh.com>
Date: Wed, 31 Jan 2024 08:25:44 +0000
Subject: [PATCH] Fix build issues in CI

---
 build.gradle       |  2 +-
 tools/homepage.xsl | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 34cee1b7e2..1e69883259 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1259,7 +1259,7 @@ task webHtml(type: Copy, dependsOn: ['report', 'webHomepage']) {
   exclude "homepage.html"
 }
 
-def buildTag = System.getenv()["CIRCLE_TAG"]
+def buildTag = System.getenv()["CI_TAG"]
 if (buildTag == null) {
   buildTag = ""
 }
diff --git a/tools/homepage.xsl b/tools/homepage.xsl
index 6237c3c43d..3d434a88e1 100644
--- a/tools/homepage.xsl
+++ b/tools/homepage.xsl
@@ -16,17 +16,30 @@
               select="'https://api.github.com/repos/' || $org || '/' || $repo || '/releases'"/>
 
 <xsl:variable name="release" as="map(*)">
-  <xsl:variable name="releases" as="array(*)">
+  <xsl:variable name="try-releases" as="array(*)">
     <xsl:try>
-      <xsl:message select="'Attempt to read', resolve-uri('../build/releases.json', static-base-uri())"/>
+      <xsl:message select="'Reading releases from', resolve-uri('../build/releases.json', static-base-uri())"/>
       <xsl:sequence select="parse-json(unparsed-text('../build/releases.json'))"/>
       <xsl:catch xmlns:err="http://www.w3.org/2005/xqt-errors">
-        <xsl:message select="'Attempt failed, trying', $reluri"/>
+        <xsl:message select="'Read failed, trying', $reluri"/>
         <xsl:message select="$err:code, $err:description"/>
         <xsl:sequence select="parse-json(unparsed-text($reluri))"/>
       </xsl:catch>
     </xsl:try>
   </xsl:variable>
+
+  <xsl:variable name="releases" as="array(*)">
+    <xsl:choose>
+      <xsl:when test="array:size($try-releases) = 0">
+        <xsl:message select="'No published releases, trying', $reluri"/>
+        <xsl:sequence select="parse-json(unparsed-text($reluri))"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:sequence select="$try-releases"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+
   <xsl:sequence select="array:get($releases, 1)"/>
 </xsl:variable>