Revert "Merge branch '769-ci-changes' into 'develop'"

This reverts merge request !689
This commit is contained in:
Eliot Berriot 2019-03-26 10:45:52 +01:00
parent 5a97dde3dc
commit 37b878270e
1 changed files with 3 additions and 56 deletions

View File

@ -115,12 +115,7 @@ black:
- pip install black - pip install black
script: script:
- black --check --diff api/ - black --check --diff api/
only:
refs:
- merge_requests
changes:
- .gitlab-ci.yml
- api/**/*
flake8: flake8:
image: python:3.6 image: python:3.6
stage: lint stage: lint
@ -134,12 +129,6 @@ flake8:
key: "$CI_PROJECT_ID__flake8_pip_cache" key: "$CI_PROJECT_ID__flake8_pip_cache"
paths: paths:
- "$PIP_CACHE_DIR" - "$PIP_CACHE_DIR"
only:
refs:
- merge_requests
changes:
- .gitlab-ci.yml
- api/**/*
test_api: test_api:
services: services:
@ -156,14 +145,7 @@ test_api:
FUNKWHALE_URL: "https://funkwhale.ci" FUNKWHALE_URL: "https://funkwhale.ci"
DJANGO_SETTINGS_MODULE: config.settings.local DJANGO_SETTINGS_MODULE: config.settings.local
only: only:
refs: - branches
- develop@funkwhale/funkwhale
- master@funkwhale/funkwhale
- tags
- merge_requests
changes:
- .gitlab-ci.yml
- api/**/*
before_script: before_script:
- cd api - cd api
- sed -i '/Pillow/d' requirements/base.txt - sed -i '/Pillow/d' requirements/base.txt
@ -181,14 +163,7 @@ test_front:
before_script: before_script:
- cd front - cd front
only: only:
refs: - branches
- develop@funkwhale/funkwhale
- master@funkwhale/funkwhale
- tags
- merge_requests
changes:
- .gitlab-ci.yml
- front/**/*
script: script:
- yarn install --check-files - yarn install --check-files
- yarn test:unit - yarn test:unit
@ -230,33 +205,6 @@ build_front:
tags: tags:
- docker - docker
build-doc:
stage: test
image: python:3.6
variables:
BUILD_PATH: "../public"
before_script:
- cd docs
- apt-get update
- apt-get install -y graphviz
- pip install sphinx
script:
- ./build_docs.sh
cache:
key: "$CI_PROJECT_ID__sphinx"
paths:
- "$PIP_CACHE_DIR"
only:
refs:
- merge_requests
changes:
- .gitlab-ci.yml
- docs/**/*
tags:
- docker
pages: pages:
stage: test stage: test
image: python:3.6 image: python:3.6
@ -278,7 +226,6 @@ pages:
- public - public
only: only:
- master@funkwhale/funkwhale - master@funkwhale/funkwhale
tags: tags:
- docker - docker