From a827ec95b69fe1f30525655878606aae29f04aa9 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Mon, 9 Dec 2019 19:13:34 -0800 Subject: [PATCH 1/3] Fix #17: Only deploy site on master branch Other branches will run everything, except deploying to the site. You can look at the generated results by browsing the artifacts from the pipeline. --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d57186..14ed090 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,3 +86,7 @@ pages: - public tags: - site-gen + /* Only deploy on master branch */ + only: + refs: + - master \ No newline at end of file -- GitLab From e9a2283ce567e9a117be6b27ed562629208b3956 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Mon, 9 Dec 2019 19:14:49 -0800 Subject: [PATCH 2/3] Use correct comment syntax --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14ed090..365b07d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,7 @@ pages: - public tags: - site-gen - /* Only deploy on master branch */ + # Only deploy on master branch only: refs: - master \ No newline at end of file -- GitLab From 13f7d8a16d02c4172eb6292ed6b5d027fba7842b Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Mon, 9 Dec 2019 19:17:55 -0800 Subject: [PATCH 3/3] Include gen directory in artifacts When building the site (build-site stage), include the gen directory in the artifacts. Same for the docs (build-docs stage). This (I hope) will let you browse the artifacts to see what was generated. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 365b07d..4925fe6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,6 +35,7 @@ site: artifacts: paths: - public + - gen # Always build the site, even if nothing has changed. Maybe we # don't really want to do this # and only build the site if something changed? @@ -52,6 +53,7 @@ docs: artifacts: paths: - public + - gen only: changes: - docs/cmu-user/*.texi -- GitLab