guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: website: Remove stale references to hydra.gnu.org


From: Ludovic Courtès
Subject: branch master updated: website: Remove stale references to hydra.gnu.org.
Date: Sat, 13 Jun 2020 16:24:46 -0400

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch master
in repository guix-artwork.

The following commit(s) were added to refs/heads/master by this push:
     new f8670f9  website: Remove stale references to hydra.gnu.org.
f8670f9 is described below

commit f8670f9507cdd294f9f192a4bf4d4fa89358e4cd
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sat Jun 13 22:23:01 2020 +0200

    website: Remove stale references to hydra.gnu.org.
    
    Fixes <https://bugs.gnu.org/41783>.
    Reported by Xu Chunyang <xuchunyang56@gmail.com>.
    
    * website/apps/base/data.scm,
    website/apps/base/templates/contribute.scm,
    website/apps/packages/templates/components.scm,
    website/apps/packages/templates/detailed-index.scm,
    website/apps/packages/templates/index.scm,
    website/static/packages/js/build-status.js: Refer to ci.guix.gnu.org
    instead of hydra.gnu.org.
---
 website/apps/base/data.scm                         |  2 +-
 website/apps/base/templates/contribute.scm         |  2 +-
 website/apps/packages/templates/components.scm     | 15 +++++----------
 website/apps/packages/templates/detailed-index.scm |  4 ++--
 website/apps/packages/templates/index.scm          |  4 ++--
 website/static/packages/js/build-status.js         |  2 +-
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index ef589d2..6182d0f 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -158,7 +158,7 @@ het Nederlands.")
     #:description
     '(p
       "Private mailing list for the "
-      (a (@ (href "https://hydra.gnu.org/";)) "build farm")
+      (a (@ (href "https://ci.guix.gnu.org/";)) "build farm")
       " system administration.")
     #:url "https://lists.gnu.org/mailman/listinfo/guix-sysadmin";
     #:log "")
diff --git a/website/apps/base/templates/contribute.scm 
b/website/apps/base/templates/contribute.scm
index f0ea1cf..d0fea8c 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -189,7 +189,7 @@
         (a (@ (href ,(guix-url "donate/")))
            "donate hardware or hosting")
         " for our "
-        (a (@ (href "https://hydra.gnu.org";)) "build farm") ".  ")
+        (a (@ (href "https://ci.guix.gnu.org";)) "build farm") ".  ")
        (p
         ,(link-more
           #:label "Contribute"
diff --git a/website/apps/packages/templates/components.scm 
b/website/apps/packages/templates/components.scm
index 166dd4b..a80115f 100644
--- a/website/apps/packages/templates/components.scm
+++ b/website/apps/packages/templates/components.scm
@@ -256,7 +256,7 @@
      If the list of supported systems of the package is empty, return
      the string 'None'. Otherwise, return a list of links to systems
      builds in hydra."
-  (let ((build-url "https://hydra.gnu.org/job/gnu/master/";)
+  (let ((build-url "https://ci.guix.gnu.org/job/gnu/master/";)
        (package-id (string-append (package-name package)
                                   "-"
                                   (package-version package)))
@@ -266,12 +266,7 @@
                   (package-transitive-supported-systems package))))
     (if (null? systems)
        "None"
-       (separate
-        (map (lambda (system)
-               (link-subtle #:label system
-                            #:url (string-append build-url
-                                                 package-id
-                                                 "."
-                                                 system)))
-             systems)
-        ", "))))
+        ;; TODO: There's currently no way to refer to a job like
+        ;; 'coreutils-8.32' in the Cuirass web UI.  Add such a link once it's
+        ;; become available.
+       (separate systems ", "))))
diff --git a/website/apps/packages/templates/detailed-index.scm 
b/website/apps/packages/templates/detailed-index.scm
index 189e8b5..89c6f23 100644
--- a/website/apps/packages/templates/detailed-index.scm
+++ b/website/apps/packages/templates/detailed-index.scm
@@ -44,10 +44,10 @@ packages to advertise."
         (@ (class "limit-width centered-block"))
         "GNU Guix provides " ,(number* (or total (length packages)))
         " packages transparently "
-        (a (@ (href "https://hydra.gnu.org/jobset/gnu/master#tabs-status";))
+        (a (@ (href "https://ci.guix.gnu.org/jobset/guix-master";))
            "available as pre-built binaries")
         ". These pages provide a complete list of the packages.  Our "
-        (a (@ (href "https://hydra.gnu.org/jobset/gnu/master";))
+        (a (@ (href "https://ci.guix.gnu.org/jobset/guix-master";))
            "continuous integration system")
         " shows their current build status "
         "(updated " ,(date->string (current-date) "~B ~e, ~Y") ").")
diff --git a/website/apps/packages/templates/index.scm 
b/website/apps/packages/templates/index.scm
index cbf0862..d1044f7 100644
--- a/website/apps/packages/templates/index.scm
+++ b/website/apps/packages/templates/index.scm
@@ -42,10 +42,10 @@
        (p
         (@ (class "limit-width centered-block"))
         "GNU Guix provides " ,(number* total) " packages transparently "
-        (a (@ (href "https://hydra.gnu.org/jobset/gnu/master#tabs-status";))
+        (a (@ (href "https://ci.guix.gnu.org/jobset/guix-master";))
            "available as pre-built binaries")
         ". These pages provide a complete list of the packages.  Our "
-        (a (@ (href "https://hydra.gnu.org/jobset/gnu/master";))
+        (a (@ (href "https://ci.guix.gnu.org/jobset/guix-master";))
            "continuous integration system")
         " shows their current build status "
         "(updated " ,(date->string (current-date) "~B ~e, ~Y") ").")
diff --git a/website/static/packages/js/build-status.js 
b/website/static/packages/js/build-status.js
index 3a1013b..67e04c3 100644
--- a/website/static/packages/js/build-status.js
+++ b/website/static/packages/js/build-status.js
@@ -3,7 +3,7 @@
 /* TODO: Implement JS build status
    https://bitbucket.org/sirgazil/guixsd-website/issues/50/
 
-This script requests package build status from hydra.gnu.org, and
+This script requests package build status from ci.guix.gnu.org, and
 updates the package list pages with the results.
 
 */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]