Skip to content
Snippets Groups Projects
Commit 6755ce52d95d authored by Matti Picus's avatar Matti Picus
Browse files

Merge branch 'branch/preview' into 'branch/default'

add a gitlab-ci runner

See merge request !21
No related branches found
No related tags found
1 merge request!21add a gitlab-ci runner
Pipeline #16020 failed
stages:
- build
- deploy
html-build:
image: registry.heptapod.net/pypy/pypy/ci:v1
stage: build
script:
- make build
#deploy-test:
# image: registry.heptapod.net/octobus/ci-dockerfiles/ci-website
# stage: deploy
# script:
# - make build # use artefact eventually
# - netlify deploy --site=056ee9b4-122d-4b02-bf62-5a2fc9776196 --auth="$NETLIFY_AUTH_TOKEN" --dir="public"
deploy:
# On a merge, regenerate the content and commit it to the repo
image: registry.heptapod.net/pypy/pypy/ci:v1
stage: deploy
only:
- branch/default
script:
- set -ex
- make build
- hg add public
- hg commit public
- hg push
......@@ -8,9 +8,9 @@
using the static site generator *nikola* (https://getnikola.com/).
To change content of the pages, please change the
files in the `files` directory only.
files in the `files` and `pages` directories only.
!! The content of `public` (with all helper directories, like js, css, ...)
is not written by hand,
**please do not modify** - it will be overwritten !!
......@@ -12,8 +12,12 @@
!! The content of `public` (with all helper directories, like js, css, ...)
is not written by hand,
**please do not modify** - it will be overwritten !!
After you make changes, do `make build` to regenerate the pages in ``public/``
but **do not commit these**, they will be rebuilt and commited via a CI deploy
step. You can also do ``make auto`` to start a server that will serve the
pages, and rebuild them when any changes are mede ot the sources.
Remark:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment