From 2d0983fc87526844653c936332232fe7bf715045 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Sun, 30 Apr 2023 03:00:03 -0700
Subject: [PATCH] Add a cache-test.html page for testing page cache
---
.gitlab-ci.yml | 8 +++++++-
src/another-page.html | 31 -------------------------------
src/cache-test.html | 35 +++++++++++++++++++++++++++++++++++
src/index.html | 14 ++++++--------
4 files changed, 48 insertions(+), 40 deletions(-)
delete mode 100644 src/another-page.html
create mode 100644 src/cache-test.html
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41678e7..5a206ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,8 +40,14 @@ setup:
script:
- sed -i
-e "s|%%BRANCH%%|${CI_COMMIT_BRANCH}|g"
+ -e "s|%%COMMIT_SHA%%|${CI_COMMIT_SHORT_SHA}|g"
+ -e "s|%%COMMIT_TIMESTAMP%%|${CI_COMMIT_TIMESTAMP}|g"
+ -e "s|%%JOB_ID%%|${CI_JOB_ID}|g"
+ -e "s|%%JOB_TIMESTAMP%%|${CI_JOB_STARTED_AT}|g"
+ -e "s|%%JOB_URL%%|${CI_JOB_URL}|g"
+ -e "s|%%PROJECT_PATH%%|${CI_PROJECT_PATH}|g"
+ -e "s|%%PROJECT_TITLE%%|${CI_PROJECT_TITLE}|g"
-e "s|%%PROJECT_URL%%|${CI_PROJECT_URL}|g"
- -e "s|%%PROJECT_NAMESPACE%%|${CI_PROJECT_NAMESPACE}|g"
src/*.html
- mv src public
artifacts:
diff --git a/src/another-page.html b/src/another-page.html
deleted file mode 100644
index 2d12891..0000000
--- a/src/another-page.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta charset="utf-8">
- <meta name="generator" content="GitLab Pages">
- <title>Another Page - Plain HTML site using GitLab Pages</title>
- <link rel="stylesheet" href="style.css">
- </head>
- <body>
- <div class="navbar">
- <a href="https://pages.gitlab.io/plain-html/">Plain HTML Example</a>
- <a href="https://gitlab.com/pages/plain-html/">Repository</a>
- <a href="https://gitlab.com/pages/">Other Examples</a>
- </div>
-
- <h1>Hello World!</h1>
-
- <p>
- This is a another page for testing global replacements.
- </p>
- <p>
- It was built on the <strong>%%BRANCH%%</strong> branch of the
- <a href="%%PROJECT_URL%%"><strong>%%PROJECT_NAMESPACE%%</strong></a> project.
- </p>
- <p>
- Go back to the <a href="index.html">homepage</a>.
- </p>
- </body>
-</html>
-
-<!-- vi: set ts=2 sw=2 et ft=html: -->
diff --git a/src/cache-test.html b/src/cache-test.html
new file mode 100644
index 0000000..d236395
--- /dev/null
+++ b/src/cache-test.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <meta name="generator" content="GitLab Pages">
+ <title>Cache Test | %%PROJECT_TITLE%%</title>
+ <link rel="preload" href="style.css" as="style">
+ <link rel="stylesheet" href="style.css">
+ </head>
+ <body>
+ <div class="navbar">
+ <a href="index.html">Homepage</a>
+ <a href="cache-test.html">Cache Test</a>
+ <a href="%%PROJECT_URL%%">Repository</a>
+ </div>
+
+ <h1>Hello World!</h1>
+
+ <p>
+ This page is meant for testing caching.
+ </p>
+ <p>
+ It was built on the <strong>%%BRANCH%%</strong> branch of the
+ <a href="%%PROJECT_URL%%"><strong>%%PROJECT_PATH%%</strong></a> project.
+ </p>
+ <p>
+ The current site revision is <a href="%%PROJECT_URL%%/-/commit/%%COMMIT_SHA%%"><code>%%COMMIT_SHA%%</code></a> from %%COMMIT_TIMESTAMP%%.
+ </p>
+ <p>
+ It was built in <a href="%%JOB_URL%%">Job %%JOB_ID%%</a> at %%JOB_TIMESTAMP%%.
+ </p>
+ </body>
+</html>
+
+<!-- vi: set ts=2 sw=2 et ft=html: -->
diff --git a/src/index.html b/src/index.html
index 1717123..43c633f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -3,14 +3,15 @@
<head>
<meta charset="utf-8">
<meta name="generator" content="GitLab Pages">
- <title>Plain HTML site using GitLab Pages</title>
+ <title>%%PROJECT_TITLE%%</title>
+ <link rel="preload" href="style.css" as="style">
<link rel="stylesheet" href="style.css">
</head>
<body>
<div class="navbar">
- <a href="https://pages.gitlab.io/plain-html/">Plain HTML Example</a>
- <a href="https://gitlab.com/pages/plain-html/">Repository</a>
- <a href="https://gitlab.com/pages/">Other Examples</a>
+ <a href="index.html">Homepage</a>
+ <a href="cache-test.html">Cache Test</a>
+ <a href="%%PROJECT_URL%%">Repository</a>
</div>
<h1>Hello World!</h1>
@@ -20,10 +21,7 @@
</p>
<p>
It was built on the <strong>%%BRANCH%%</strong> branch of the
- <a href="%%PROJECT_URL%%"><strong>%%PROJECT_NAMESPACE%%</strong></a> project.
- </p>
- <p>
- Go check out this <a href="another-page.html">other page</a>.
+ <a href="%%PROJECT_URL%%"><strong>%%PROJECT_PATH%%</strong></a> project.
</p>
</body>
</html>
--
GitLab