From ce620675e3cbd4205f9c07ad4433324c974fd200 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Tue, 10 Dec 2019 22:23:17 -0800 Subject: [PATCH 1/4] Fix #22: Simplify CI by removing gen directory Now copy everything into the public directory instead of the gen directory and copying that to the public directory in the last stage of CI. --- .gitlab-ci.yml | 16 +++++++--------- docs/cmu-user/Makefile | 2 +- docs/interface/Makefile | 2 +- docs/internals/Makefile | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4925fe6..f6eaaa2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,6 @@ cache: - texinfo - bin - share - - gen # Just creates the public directory where we're keeping all of the # generated docs. @@ -35,14 +34,13 @@ 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? script: # Just need to copy all of the html files to the gen directory - - (cd cmucl-www/www; tar cf - .) | (cd gen; tar xf -) - - ls -F gen + - (cd cmucl-www/www; tar cf - .) | (cd public; tar xf -) + - ls -F public # Generates the texi docs. Only done if some texi file changed so we don't # have to download and build texinfo if nothing changed. @@ -53,12 +51,14 @@ docs: artifacts: paths: - public - - gen only: changes: - docs/cmu-user/*.texi + - docs/cmu-user/Makefile - docs/interface/*.texi - - docs/internals/*.texi + - docs/internals/Makefile + - docs/interface/*.texi + - docs/internals/Makefile script: # Get dev version of texinfo - ./build-texinfo.sh @@ -81,8 +81,6 @@ docs: # Deploys the things we created in public/ and copies that to the website. pages: stage: deploy - script: - - cp -r gen/* public artifacts: paths: - public @@ -91,4 +89,4 @@ pages: # Only deploy on master branch only: refs: - - master \ No newline at end of file + - master diff --git a/docs/cmu-user/Makefile b/docs/cmu-user/Makefile index e64f084..896e265 100644 --- a/docs/cmu-user/Makefile +++ b/docs/cmu-user/Makefile @@ -51,7 +51,7 @@ cmu-user : all : cmu-user-info.tar.bz2 cmu-user.pdf cmu-user.html cmu-user/index.html cmu-user-html.tar.bz2 -PUBUSER = ../../gen/docs/cmu-user +PUBUSER = ../../public/docs/cmu-user $(PUBUSER) : mkdir -p $@ diff --git a/docs/interface/Makefile b/docs/interface/Makefile index c6111d6..180f4c8 100644 --- a/docs/interface/Makefile +++ b/docs/interface/Makefile @@ -22,7 +22,7 @@ toolkit : internals : mkdir internals -PUBDIR = ../../gen/docs/interface +PUBDIR = ../../public/docs/interface $(PUBDIR)/internals : mkdir -p $@ diff --git a/docs/internals/Makefile b/docs/internals/Makefile index aa2e09b..c99ed5d 100644 --- a/docs/internals/Makefile +++ b/docs/internals/Makefile @@ -34,7 +34,7 @@ design/index.html : design $(SRCS) design : mkdir design -PUBDIR = ../../gen/docs/internals +PUBDIR = ../../public/docs/internals $(PUBDIR) : mkdir -p $@ -- GitLab From a0f9c1da019c7adaccadef2bd91cd608343801f2 Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Tue, 10 Dec 2019 22:29:15 -0800 Subject: [PATCH 2/4] Script is required for deploy stage Just echo out something. --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6eaaa2..195adea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,6 +81,8 @@ docs: # Deploys the things we created in public/ and copies that to the website. pages: stage: deploy + script: + - echo Deploying artifacts: paths: - public -- GitLab From b7bbb412798ef696186fa72150db300f55d2fc1c Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Tue, 10 Dec 2019 22:32:24 -0800 Subject: [PATCH 3/4] Force building of manuals For testing that this works. --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 195adea..eb4664d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,14 +51,14 @@ docs: artifacts: paths: - public - only: - changes: - - docs/cmu-user/*.texi - - docs/cmu-user/Makefile - - docs/interface/*.texi - - docs/internals/Makefile - - docs/interface/*.texi - - docs/internals/Makefile +# only: +# changes: +# - docs/cmu-user/*.texi +# - docs/cmu-user/Makefile +# - docs/interface/*.texi +# - docs/internals/Makefile +# - docs/interface/*.texi +# - docs/internals/Makefile script: # Get dev version of texinfo - ./build-texinfo.sh -- GitLab From bb3dfacf2b8d663eae1da0fc1299707040b3852c Mon Sep 17 00:00:00 2001 From: Raymond Toy Date: Tue, 10 Dec 2019 22:36:16 -0800 Subject: [PATCH 4/4] Undo previous change The artifacts from build the docs has the expected manuals. We can undo the last change so that we only build the manuals if something has changed. --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb4664d..195adea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,14 +51,14 @@ docs: artifacts: paths: - public -# only: -# changes: -# - docs/cmu-user/*.texi -# - docs/cmu-user/Makefile -# - docs/interface/*.texi -# - docs/internals/Makefile -# - docs/interface/*.texi -# - docs/internals/Makefile + only: + changes: + - docs/cmu-user/*.texi + - docs/cmu-user/Makefile + - docs/interface/*.texi + - docs/internals/Makefile + - docs/interface/*.texi + - docs/internals/Makefile script: # Get dev version of texinfo - ./build-texinfo.sh -- GitLab