diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 323eed75..ec9f0818 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,3 +59,18 @@ k8s-ticket-testing-deploy: when: manual only: - ticket-testing + +pages: + image: alpine + script: + - apk --no-cache add py2-pip python-dev make + - pip install sphinx + - cd docs + - make html + - cd .. + - mv docs/_build/html public + artifacts: + paths: + - public + only: + - master diff --git a/fixtures/conference.json b/fixtures/conference.json index e4950e4a..9469a305 100644 --- a/fixtures/conference.json +++ b/fixtures/conference.json @@ -30,5 +30,16 @@ "end_date": "2018-01-23", "slug": "miniconf" } + }, + { + "fields": { + "conference": 1, + "end_date": "2018-01-22", + "name": "Open Hardware Miniconf", + "slug": "openhardware-miniconf", + "start_date": "2018-01-22" + }, + "model": "symposion_conference.section", + "pk": 3 } ] diff --git a/fixtures/proposal_base.json b/fixtures/proposal_base.json index cc7bf12b..ebc93eec 100644 --- a/fixtures/proposal_base.json +++ b/fixtures/proposal_base.json @@ -47,5 +47,14 @@ "name": "Miniconf", "slug": "miniconf" } + }, + { + "fields": { + "name": "Open Hardware Miniconf", + "section": 3, + "slug": "openhardware-miniconf" + }, + "model": "symposion_proposals.proposalkind", + "pk": 4 } ]