Skip to content

Commit c8a7e31

Browse files
max-wittigmax-wittig
authored
Merge pull request #831 from python-gitlab/chore/move-back-to-travis
chore: move checks back to travis
2 parents 2e42e28 + b764525 commit c8a7e31

File tree

2 files changed

+77
-74
lines changed

2 files changed

+77
-74
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,10 @@
11
image: python:3.7
22

33
stages:
4-
- lint
5-
- build-test-image
6-
- test
74
- deploy
85

9-
commitlint:
10-
image: node:12
11-
stage: lint
12-
before_script:
13-
- npm install -g @commitlint/cli @commitlint/config-conventional
14-
- 'echo "module.exports = {extends: [\"@commitlint/config-conventional\"]}" > commitlint.config.js'
15-
script:
16-
- npx commitlint --from=origin/master
17-
except:
18-
- master
19-
20-
black_lint:
21-
stage: lint
22-
before_script:
23-
- pip3 install black
24-
script:
25-
- black --check .
26-
except:
27-
- master
28-
296
build_test_image:
30-
stage: build-test-image
7+
stage: deploy
318
image:
329
name: gcr.io/kaniko-project/executor:debug
3310
entrypoint: [""]
@@ -40,55 +17,6 @@ build_test_image:
4017
changes:
4118
- tools/*
4219

43-
.tox_includes: &tox_includes
44-
stage: test
45-
before_script:
46-
- pip install tox
47-
script:
48-
- tox -e $TOX_ENV
49-
50-
test_2.7:
51-
<<: *tox_includes
52-
image: python:2.7
53-
variables:
54-
TOX_ENV: py27
55-
56-
test_3.4:
57-
<<: *tox_includes
58-
image: python:3.4
59-
variables:
60-
TOX_ENV: py34
61-
62-
test_3.5:
63-
<<: *tox_includes
64-
image: python:3.5
65-
variables:
66-
TOX_ENV: py35
67-
68-
test_3.6:
69-
<<: *tox_includes
70-
image: python:3.6
71-
variables:
72-
TOX_ENV: py36
73-
74-
test_3.7:
75-
<<: *tox_includes
76-
image: python:3.7
77-
variables:
78-
TOX_ENV: py37
79-
80-
test_3.8:
81-
<<: *tox_includes
82-
image: python:3.8-rc-alpine
83-
variables:
84-
TOX_ENV: py38
85-
allow_failure: true
86-
87-
test_docs:
88-
<<: *tox_includes
89-
variables:
90-
TOX_ENV: docs
91-
9220
deploy:
9321
stage: deploy
9422
script:

‎.travis.yml

Lines changed: 76 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,86 @@ sudo: required
22
services:
33
- docker
44
language: python
5-
python: 2.7
65
env:
76
#- TOX_ENV=py_func_v4
87
- TOX_ENV=cli_func_v4
98
install:
109
- pip install tox
1110
script:
1211
- tox -e $TOX_ENV
12+
13+
git:
14+
depth: false
15+
16+
stages:
17+
- lint
18+
- test
19+
20+
jobs:
21+
include:
22+
- stage: lint
23+
name: commitlint
24+
script:
25+
- npm install -g @commitlint/cli @commitlint/config-conventional
26+
- 'echo "module.exports = {extends: [\"@commitlint/config-conventional\"]}" > commitlint.config.js'
27+
- npx commitlint --from=origin/master
28+
- stage: lint
29+
name: black_lint
30+
dist: bionic
31+
python: 3.7
32+
script:
33+
- pip3 install black
34+
- black --check .
35+
- stage: test
36+
name: cli_func_v4
37+
dist: bionic
38+
python: 3.7
39+
script:
40+
- pip3 install tox
41+
- tox -e cli_func_v4
42+
- stage: test
43+
name: docs
44+
dist: bionic
45+
python: 3.7
46+
script:
47+
- pip3 install tox
48+
- tox -e docs
49+
- stage: test
50+
name: py27
51+
python: 2.7
52+
script:
53+
- pip2 install tox
54+
- tox -e py27
55+
- stage: test
56+
name: py34
57+
python: 3.4
58+
script:
59+
- pip3 install tox
60+
- tox -e py34
61+
- stage: test
62+
name: py35
63+
python: 3.5
64+
script:
65+
- pip3 install tox
66+
- tox -e py35
67+
- stage: test
68+
name: py36
69+
python: 3.6
70+
dist: bionic
71+
script:
72+
- pip3 install tox
73+
- tox -e py36
74+
- stage: test
75+
name: py37
76+
dist: bionic
77+
python: 3.7
78+
script:
79+
- pip3 install tox
80+
- tox -e py37
81+
- stage: test
82+
dist: bionic
83+
name: py38
84+
python: 3.8-dev
85+
script:
86+
- pip3 install tox
87+
- tox -e py38

0 commit comments

Comments
 (0)