Skip to content

Commit

Permalink
Merge pull request #3960 from radarhere/docker
Browse files Browse the repository at this point in the history
Updated Docker jobs
  • Loading branch information
hugovk committed Jul 10, 2019
2 parents 67f309c + 9bfbd56 commit 1c57a41
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -39,7 +39,8 @@ matrix:
- env: DOCKER="arch" DOCKER_TAG="master" # contains PyQt5
- env: DOCKER="ubuntu-16.04-xenial-amd64" DOCKER_TAG="master"
- env: DOCKER="ubuntu-18.04-bionic-amd64" DOCKER_TAG="master"
- env: DOCKER="debian-stretch-x86" DOCKER_TAG="master"
- env: DOCKER="debian-9-stretch-x86" DOCKER_TAG="master"
- env: DOCKER="debian-10-buster-x86" DOCKER_TAG="master"
- env: DOCKER="centos-6-amd64" DOCKER_TAG="master"
- env: DOCKER="centos-7-amd64" DOCKER_TAG="master"
- env: DOCKER="amazon-1-amd64" DOCKER_TAG="master"
Expand Down
9 changes: 7 additions & 2 deletions azure-pipelines.yml
Expand Up @@ -33,8 +33,13 @@ jobs:

- template: .azure-pipelines/jobs/test-docker.yml
parameters:
docker: 'debian-stretch-x86'
name: 'debian_stretch_x86'
docker: 'debian-9-stretch-x86'
name: 'debian_9_stretch_x86'

- template: .azure-pipelines/jobs/test-docker.yml
parameters:
docker: 'debian-10-buster-x86'
name: 'debian_10_buster_x86'

- template: .azure-pipelines/jobs/test-docker.yml
parameters:
Expand Down
4 changes: 3 additions & 1 deletion docs/installation.rst
Expand Up @@ -382,7 +382,7 @@ These platforms are built and tested for every change.
+----------------------------------+-------------------------------+-----------------------+
|**Operating system** |**Tested Python versions** |**Tested Architecture**|
+----------------------------------+-------------------------------+-----------------------+
| Alpine | 2.7, 3.6 |x86-64 |
| Alpine | 2.7, 3.7 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
| Arch | 2.7, 3.7 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
Expand All @@ -396,6 +396,8 @@ These platforms are built and tested for every change.
+----------------------------------+-------------------------------+-----------------------+
| Debian 9 Stretch | 2.7, 3.5 |x86 |
+----------------------------------+-------------------------------+-----------------------+
| Debian 10 Buster | 2.7, 3.7 |x86 |
+----------------------------------+-------------------------------+-----------------------+
| Fedora 29 | 2.7, 3.7 |x86-64 |
+----------------------------------+-------------------------------+-----------------------+
| Fedora 30 | 2.7, 3.7 |x86-64 |
Expand Down

0 comments on commit 1c57a41

Please sign in to comment.