[Git][java-team/pkg-java-blog][master] 2 commits: Renamed the output directory to 'public' for Gitlab

[Emmanuel Bourg]

Emmanuel Bourg pushed to branch master at Debian Java Maintainers / pkg-java-blog


Commits:
2d8119ec by Emmanuel Bourg at 2018-05-03T17:28:40+02:00
Renamed the output directory to 'public' for Gitlab

- - - - -
822bd077 by Emmanuel Bourg at 2018-05-03T17:29:40+02:00
Updated the notes

- - - - -


5 changed files:

- .gitignore
- .gitlab-ci.yml
- Makefile
- README.txt
- develop_server.sh


Changes:

=====================================
.gitignore
=====================================
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.py[cod]
-output
+public


=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,6 @@ pages:
   - make html
   artifacts:
     paths:
-    - output
+    - public
   only:
   - master


=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ PELICANOPTS=--ignore-cache
 
 BASEDIR=$(CURDIR)
 INPUTDIR=$(BASEDIR)/content
-OUTPUTDIR=$(BASEDIR)/output
+OUTPUTDIR=$(BASEDIR)/public
 CONFFILE=$(BASEDIR)/pelicanconf.py
 PUBLISHCONF=$(BASEDIR)/publishconf.py
 


=====================================
README.txt
=====================================
--- a/README.txt
+++ b/README.txt
@@ -21,8 +21,6 @@ Updating the blog
 
 5. Change the status of the article from 'draft' to 'published'
 
-6. Run 'make html' to generate the pages
+6. Commit and push the final changes to Salsa
 
-7. Commit and push the final changes to Salsa
-
-8. Wait for the Gitlab job to regenerate the site
+7. Wait for the Gitlab job to regenerate the site


=====================================
develop_server.sh
=====================================
--- a/develop_server.sh
+++ b/develop_server.sh
@@ -8,7 +8,7 @@ PELICANOPTS=
 
 BASEDIR=$(pwd)
 INPUTDIR=$BASEDIR/content
-OUTPUTDIR=$BASEDIR/output
+OUTPUTDIR=$BASEDIR/public
 CONFFILE=$BASEDIR/pelicanconf.py
 
 ###



View it on GitLab: https://salsa.debian.org/java-team/pkg-java-blog/compare/5beb2ae590aff5287aa91e78bd8007699a913afc...822bd0772b3b16ea68a08ce4064b395ddea8f1ae

---
View it on GitLab: https://salsa.debian.org/java-team/pkg-java-blog/compare/5beb2ae590aff5287aa91e78bd8007699a913afc...822bd0772b3b16ea68a08ce4064b395ddea8f1ae
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180503/f8f92468/attachment.html>