From abf6e34badae25d621c11bfcfed47ccb2bda0977 Mon Sep 17 00:00:00 2001
From: Jason Kridner <jkridner@beagleboard.org>
Date: Sun, 3 Jul 2022 16:20:26 -0400
Subject: [PATCH] Adding branch names was ill-conceived
---
.gitlab-ci.yml | 27 ++++++---------------------
redirect.html | 9 ---------
2 files changed, 6 insertions(+), 30 deletions(-)
delete mode 100644 redirect.html
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 887120cb..e51af10a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,7 @@
image: python:3.9-alpine
stages:
- - deploy-main
- - deploy-branch
+ - deploy
before_script:
- apk update
@@ -14,28 +13,14 @@ before_script:
- apk add texlive-full
- apk add make
-pages_main:
- stage: deploy-main
+pages:
+ stage: deploy
script:
- - sphinx-build -b html . public/latest
- - sphinx-build -M latexpdf . public/latest
- - mv public/latest/latex/beagleboard-docs.pdf public/latest/
- - cp redirect.html public/index.html
+ - sphinx-build -b html . public
+ - sphinx-build -M latexpdf . public
+ - mv public/latest/latex/beagleboard-docs.pdf public/
artifacts:
paths:
- public
rules:
- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-
-pages_branch:
- stage: deploy-branch
- script:
- - sphinx-build -b html . public/$CI_COMMIT_REF_NAME
- - sphinx-build -M latexpdf . public/$CI_COMMIT_REF_NAME
- - mv public/$CI_COMMIT_REF_NAME/latex/beagleboard-docs.pdf public/$CI_COMMIT_REF_NAME/
- artifacts:
- paths:
- - public
- rules:
- - if: $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH
-
diff --git a/redirect.html b/redirect.html
deleted file mode 100644
index 7964945a..00000000
--- a/redirect.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="refresh" content="0; url='latest/'" />
- </head>
- <body>
- <p>Please follow <a href="latest/">this link</a>.</p>
- </body>
-</html>
--
GitLab