Skip to content

Commit

Permalink
static website tweaks
Browse files Browse the repository at this point in the history
We don't need the artifacts from any builds, and add a dedicated Makefile target to update the '/public' directory.

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
  • Loading branch information
dlenski committed Feb 20, 2021
1 parent 27331d0 commit 4138108
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -55,6 +55,7 @@ Makefile

/www/*.html
/www/openconnect.8.inc
/public/

test-driver
tests/*.log
Expand Down
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Expand Up @@ -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
6 changes: 5 additions & 1 deletion www/Makefile.am
Expand Up @@ -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
Expand All @@ -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)

Expand Down

0 comments on commit 4138108

Please sign in to comment.