diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 58779f648..e961cb178 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,33 +1,10 @@
image: python:3.7
stages:
- - lint
- - build-test-image
- - test
- deploy
-commitlint:
- image: node:12
- stage: lint
- before_script:
- - npm install -g @commitlint/cli @commitlint/config-conventional
- - 'echo "module.exports = {extends: [\"@commitlint/config-conventional\"]}" > commitlint.config.js'
- script:
- - npx commitlint --from=origin/master
- except:
- - master
-
-black_lint:
- stage: lint
- before_script:
- - pip3 install black
- script:
- - black --check .
- except:
- - master
-
build_test_image:
- stage: build-test-image
+ stage: deploy
image:
name: gcr.io/kaniko-project/executor:debug
entrypoint: [""]
@@ -40,55 +17,6 @@ build_test_image:
changes:
- tools/*
-.tox_includes: &tox_includes
- stage: test
- before_script:
- - pip install tox
- script:
- - tox -e $TOX_ENV
-
-test_2.7:
- <<: *tox_includes
- image: python:2.7
- variables:
- TOX_ENV: py27
-
-test_3.4:
- <<: *tox_includes
- image: python:3.4
- variables:
- TOX_ENV: py34
-
-test_3.5:
- <<: *tox_includes
- image: python:3.5
- variables:
- TOX_ENV: py35
-
-test_3.6:
- <<: *tox_includes
- image: python:3.6
- variables:
- TOX_ENV: py36
-
-test_3.7:
- <<: *tox_includes
- image: python:3.7
- variables:
- TOX_ENV: py37
-
-test_3.8:
- <<: *tox_includes
- image: python:3.8-rc-alpine
- variables:
- TOX_ENV: py38
- allow_failure: true
-
-test_docs:
- <<: *tox_includes
- variables:
- TOX_ENV: docs
-
deploy:
stage: deploy
script:
diff --git a/.travis.yml b/.travis.yml
index 0a38cfae8..18ded190e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ sudo: required
services:
- docker
language: python
-python: 2.7
env:
#- TOX_ENV=py_func_v4
- TOX_ENV=cli_func_v4
@@ -10,3 +9,79 @@ install:
- pip install tox
script:
- tox -e $TOX_ENV
+
+git:
+ depth: false
+
+stages:
+ - lint
+ - test
+
+jobs:
+ include:
+ - stage: lint
+ name: commitlint
+ script:
+ - npm install -g @commitlint/cli @commitlint/config-conventional
+ - 'echo "module.exports = {extends: [\"@commitlint/config-conventional\"]}" > commitlint.config.js'
+ - npx commitlint --from=origin/master
+ - stage: lint
+ name: black_lint
+ dist: bionic
+ python: 3.7
+ script:
+ - pip3 install black
+ - black --check .
+ - stage: test
+ name: cli_func_v4
+ dist: bionic
+ python: 3.7
+ script:
+ - pip3 install tox
+ - tox -e cli_func_v4
+ - stage: test
+ name: docs
+ dist: bionic
+ python: 3.7
+ script:
+ - pip3 install tox
+ - tox -e docs
+ - stage: test
+ name: py27
+ python: 2.7
+ script:
+ - pip2 install tox
+ - tox -e py27
+ - stage: test
+ name: py34
+ python: 3.4
+ script:
+ - pip3 install tox
+ - tox -e py34
+ - stage: test
+ name: py35
+ python: 3.5
+ script:
+ - pip3 install tox
+ - tox -e py35
+ - stage: test
+ name: py36
+ python: 3.6
+ dist: bionic
+ script:
+ - pip3 install tox
+ - tox -e py36
+ - stage: test
+ name: py37
+ dist: bionic
+ python: 3.7
+ script:
+ - pip3 install tox
+ - tox -e py37
+ - stage: test
+ dist: bionic
+ name: py38
+ python: 3.8-dev
+ script:
+ - pip3 install tox
+ - tox -e py38
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy