diff options
| author | Javier Jardón <jjardon@gnome.org> | 2019-04-04 15:58:08 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2019-04-04 15:58:08 +0000 |
| commit | 9f269707f784d73df8e7edb4b0943d91d4fa61a9 (patch) | |
| tree | aa78c81db59d02e32daa05fc7587e48b00704fcf | |
| parent | 88597e7bb5e464989d6d80e992520cb2853d88ef (diff) | |
| parent | ec11582b96737299696e543010a88f69975f311d (diff) | |
| download | buildstream-9f269707f784d73df8e7edb4b0943d91d4fa61a9.tar.gz | |
Merge branch 'jjardon/bst_1_2_fedora_29' into 'bst-1.2'
[1.2] .gitlab-ci.yml: Remove deprecated fedora-27 and add current stable fedora-29
See merge request BuildStream/buildstream!1276
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | requirements/dev-requirements.txt | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 061bb398b..eeb17b1bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,14 +47,14 @@ tests-debian-9: image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:9-master-46405991 <<: *tests -tests-fedora-27: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:27-master-46405991 - <<: *tests - tests-fedora-28: image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991 <<: *tests +tests-fedora-29: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095 + <<: *tests + tests-ubuntu-18.04: image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991 <<: *tests @@ -189,8 +189,8 @@ coverage: - cp -a .coverage-reports/ ./coverage-report dependencies: - tests-debian-9 - - tests-fedora-27 - tests-fedora-28 + - tests-fedora-29 - tests-ubuntu-18.04 - tests-unix except: diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index cb60332d2..5eea578c5 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -23,5 +23,4 @@ py==1.8.0 pytest-cache==1.0 pytest-forked==1.0.2 six==1.12.0 -typed-ast==1.2.0 wrapt==1.11.1 |