diff --git a/.gitignore b/.gitignore index d45a9bea..a5d3705e 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ Makefile /www/*.html /www/openconnect.8.inc +/public/ test-driver tests/*.log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eac25988..c1ec190b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -486,12 +486,12 @@ pages: script: - ./autogen.sh - ./configure - - make -j4 -C www - - mv www public - dependencies: - - "Fedora/GnuTLS" + - make -C www update + dependencies: [] artifacts: paths: - public + only: + - master only: - master@openconnect/openconnect diff --git a/www/Makefile.am b/www/Makefile.am index 5674e4ed..5e7a5cf2 100644 --- a/www/Makefile.am +++ b/www/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = styles inc images CONV = "$(srcdir)/html.py" FTR_PAGES = csd.html charset.html token.html pkcs11.html tpm.html features.html gui.html nonroot.html hip.html tncc.html -START_PAGES = building.html connecting.html manual.html vpnc-script.html +START_PAGES = building.html connecting.html manual.html vpnc-script.html INDEX_PAGES = changelog.html download.html index.html packages.html platforms.html licence.html PROTO_PAGES = anyconnect.html juniper.html globalprotect.html pulse.html TOPLEVEL_PAGES = contribute.html mail.html @@ -13,6 +13,10 @@ ALL_PAGES = $(FTR_PAGES) $(START_PAGES) $(INDEX_PAGES) $(TOPLEVEL_PAGES) $(PROTO html_DATA = $(ALL_PAGES) +update: $(ALL_PAGES) + mkdir -p $(top_builddir)/public + rsync -av ./ --exclude ocserv-git/ --exclude html.py --exclude 'Makefi*' --exclude '*~' --exclude '.git*' --exclude '*.xml' $(top_builddir)/public/ + .xml.html: $(PYTHON) $(CONV) -d $(srcdir) $< > $@ || (rm $@; exit 1)