diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4925fe6f452106a7df92275aa669c712a48ef93d..195adeaf941f549c114b11ffd7e090647ea445cd 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 @@ -82,7 +82,7 @@ docs: pages: stage: deploy script: - - cp -r gen/* public + - echo Deploying artifacts: paths: - public @@ -91,4 +91,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 e64f084042fa2810698ede1fb99e5c9069758d7a..896e265cf66b1f7d6c2a2419ad9edcf438b47a80 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 c6111d6fd31fecc1542222f7a21eec8951bff5d5..180f4c88e11007ca481cc76c0899efb2980f739c 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 aa2e09b7733e5aa8cfe78a550edcfed8edb7bdd9..c99ed5d0aa413d5b63381eefefe2d8eb940238ab 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 $@