3 commits - .gitlab-ci/pages-index.html .gitlab-ci.yml

Fri Sep 6 16:06:26 UTC 2024

.gitlab-ci.yml              |   10 +++++-----
 .gitlab-ci/pages-index.html |   13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit 65a29e787aedde9ec8d8c6248bbd761791d72d04
Merge: 781cf20bf 1ed8bb654
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Sep 6 16:06:20 2024 +0000

    Merge branch 'landing-page' into 'master'
    
    Add a landing page for GitLab pages
    
    See merge request cairo/cairo!594

commit 1ed8bb65434214ba3362f7bf1f9ae0fb379f17d9
Author: Federico Mena Quintero <federico at gnome.org>
Date:   Thu Sep 5 10:13:53 2024 -0600

    Oops, don't list the analysis stage twice

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9edde3298..3c26742a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,7 +31,6 @@ variables:
 
 stages:
   - prep
-  - analysis
   - build
   - test
   - analysis
commit 3f709d0050d1830ee9f04b92d8a9b59baa59e5a8
Author: Federico Mena Quintero <federico at gnome.org>
Date:   Thu Sep 5 10:09:26 2024 -0600

    Add a landing page for GitLab pages
    
    GitLab pages for cairo appear in
    https://cairo.pages.freedesktop.org/cairo/ but there is nothing there
    right now, so it gives a 404.  Only
    https://cairo.pages.freedesktop.org/cairo/coverage works so far.
    
    So, add public/index.html as a minimal landing page.  My intention is
    to link other things from there - an HTMLized report of the test
    suite, a development guide, things like that.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96d8c1cb1..9edde3298 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -524,14 +524,15 @@ coverage:
 
 pages:
   stage: 'deploy'
-  needs: [ coverage ]
+  needs:
+    - job: coverage
   script:
-    # No-op, just to gitlab thinks there's something to do.
-    # The jobs that this job depends on have already populated public/
-    - echo
+    - mkdir -p public
+    - cp .gitlab-ci/pages-index.html public/index.html
   artifacts:
     paths:
       - public
+    expire_in: 1 day
   rules:
     # Restrict to the main branch so not every branch tries to deploy the web site
     - if: ($CI_DEFAULT_BRANCH == $CI_COMMIT_BRANCH)
diff --git a/.gitlab-ci/pages-index.html b/.gitlab-ci/pages-index.html
new file mode 100644
index 000000000..9a6aba58a
--- /dev/null
+++ b/.gitlab-ci/pages-index.html
@@ -0,0 +1,13 @@
+<html>
+  <head>
+    <title>Cairo's development pages</title>
+  </head>
+
+  <body>
+    <h1>Cairo's development pages</h1>
+
+    <ul>
+      <li><a href="coverage/">Test coverage report</a></li>
+    </ul>
+  </body>
+</html>
