Skip to content

Commit

Permalink
Fix master CI tests
Browse files Browse the repository at this point in the history
  • Loading branch information
onegreyonewhite committed Dec 19, 2019
1 parent cb733a4 commit 363dd55
Showing 1 changed file with 13 additions and 24 deletions.
37 changes: 13 additions & 24 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,28 +41,25 @@ stages:
- make build-clean
except:
refs:
- GUI
- master
- tags
- issue_building
only:
refs:
- merge_requests
- web
- master
# changes:
# - polemarch/main/**/*
# - polemarch/api/**/*
# - polemarch/__init__.py
# - tests.py
# - setup.{py,cfg}
# - MANIFEST.in
# - requirements.txt
# - requirements-test.txt
# - Makefile
# - tox.ini
# - .coveragerc
# - .gitlab-ci.yml
changes:
- polemarch/main/**/*
- polemarch/api/**/*
- polemarch/__init__.py
- tests.py
- setup.{py,cfg}
- MANIFEST.in
- requirements.txt
- requirements-test.txt
- Makefile
- tox.ini
- .coveragerc
- .gitlab-ci.yml
retry: 2

# Branch tests
Expand Down Expand Up @@ -94,14 +91,6 @@ py36-install:
variables:
TOX_ENVS: "$CI_BUILD_NAME"

master:
<<: *branch_tests
variables:
TOX_ENVS: "py37-coverage"
only:
refs:
- master

# Realese
###########################################
deploy_environment:
Expand Down

0 comments on commit 363dd55

Please sign in to comment.