diff options
| author | Florian Bruhin <me@the-compiler.org> | 2020-06-24 19:36:30 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2020-06-24 19:36:30 +0200 |
| commit | 76e8debbc08288c5321be34a5f747e58ab997abe (patch) | |
| tree | 8e4efcab172e2925c9359780797aba2fb2b76a34 | |
| parent | a0f078da38603f8e6556b5c1c0fb836426943ddd (diff) | |
| download | qutebrowser-76e8debbc08288c5321be34a5f747e58ab997abe.tar.gz qutebrowser-76e8debbc08288c5321be34a5f747e58ab997abe.zip | |
ci: Switch from TRAVIS to CI env vars
| -rwxr-xr-x | scripts/dev/check_doc_changes.py | 6 | ||||
| -rw-r--r-- | scripts/dev/ci/travis_run.sh | 1 | ||||
| -rw-r--r-- | tests/conftest.py | 4 | ||||
| -rw-r--r-- | tests/end2end/fixtures/quteprocess.py | 2 | ||||
| -rw-r--r-- | tox.ini | 4 |
5 files changed, 8 insertions, 9 deletions
diff --git a/scripts/dev/check_doc_changes.py b/scripts/dev/check_doc_changes.py index f673ad4ea..c1194236a 100755 --- a/scripts/dev/check_doc_changes.py +++ b/scripts/dev/check_doc_changes.py @@ -40,9 +40,9 @@ if code != 0: print() print('(Or you have uncommitted changes, in which case you can ignore ' 'this.)') - if 'TRAVIS' in os.environ: + if 'CI' in os.environ: print() - print("travis_fold:start:gitdiff") + # print("travis_fold:start:gitdiff") subprocess.run(['git', '--no-pager', 'diff'], check=True) - print("travis_fold:end:gitdiff") + # print("travis_fold:end:gitdiff") sys.exit(code) diff --git a/scripts/dev/ci/travis_run.sh b/scripts/dev/ci/travis_run.sh index 69cc120dd..f0220ce60 100644 --- a/scripts/dev/ci/travis_run.sh +++ b/scripts/dev/ci/travis_run.sh @@ -7,7 +7,6 @@ if [[ -n $DOCKER ]]; then -e "QUTE_BDD_WEBENGINE=$QUTE_BDD_WEBENGINE" \ -e "DOCKER=$DOCKER" \ -e "CI=$CI" \ - -e "TRAVIS=$TRAVIS" \ "qutebrowser/ci:$DOCKER" elif [[ $TESTENV == eslint ]]; then # Can't run this via tox as we can't easily install tox in the javascript diff --git a/tests/conftest.py b/tests/conftest.py index e698bde74..a36255f76 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -294,8 +294,8 @@ def apply_fake_os(monkeypatch, request): @pytest.fixture(scope='session', autouse=True) def check_yaml_c_exts(): - """Make sure PyYAML C extensions are available on Travis.""" - if 'TRAVIS' in os.environ: + """Make sure PyYAML C extensions are available on CI.""" + if 'CI' in os.environ: from yaml import CLoader diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 2e47c9e43..4ff9dc21d 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -711,7 +711,7 @@ class QuteProc(testprocess.Process): is_dl_inconsistency = str(self.captured_log[-1]).endswith( "_dl_allocate_tls_init: Assertion " "`listp->slotinfo[cnt].gen <= GL(dl_tls_generation)' failed!") - if 'TRAVIS' in os.environ and is_dl_inconsistency: + if 'CI' in os.environ and is_dl_inconsistency: # WORKAROUND for https://sourceware.org/bugzilla/show_bug.cgi?id=19329 self.captured_log = [] self._log("NOTE: Restarted after libc DL inconsistency!") @@ -14,7 +14,7 @@ setenv = pyqt{,57,59,510,511,512,513,514,515}: LINK_PYQT_SKIP=true pyqt{,57,59,510,511,512,513,514,515}: QUTE_BDD_WEBENGINE=true cov: PYTEST_ADDOPTS=--cov --cov-report xml --cov-report=html --cov-report= -passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI TRAVIS XDG_* QUTE_* DOCKER QT_QUICK_BACKEND +passenv = PYTHON DISPLAY XAUTHORITY HOME USERNAME USER CI XDG_* QUTE_* DOCKER QT_QUICK_BACKEND basepython = py35: {env:PYTHON:python3.5} py36: {env:PYTHON:python3.6} @@ -148,7 +148,7 @@ commands = basepython = {env:PYTHON:python3} pip_version = pip whitelist_externals = git -passenv = TRAVIS TRAVIS_PULL_REQUEST +passenv = CI TRAVIS_PULL_REQUEST deps = -r{toxinidir}/requirements.txt -r{toxinidir}/misc/requirements/requirements-pyqt.txt |