Skip to content

Commit bb34a64

Browse files
committed
Try to make Fedora work
Signed-off-by: Philippe Ombredanne <[email protected]>
1 parent cb67b06 commit bb34a64

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

azure-pipelines.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,64 +19,64 @@ jobs:
1919
name: Ubuntu_16
2020
image_name: ubuntu-16.04
2121
matrix:
22-
Python_27_Linux:
22+
py27:
2323
python_version: '2.7'
24-
Python_36_Linux:
24+
py36:
2525
python_version: '3.6'
26-
Python_37_Linux:
26+
py37:
2727
python_version: '3.7'
2828

2929
- template: etc/ci/azure-posix.yml
3030
parameters:
3131
name: macOS_1013
3232
image_name: macos-10.13
3333
matrix:
34-
Python_27_Mac:
34+
py27:
3535
python_version: '2.7'
36-
Python_36_Mac:
36+
py36:
3737
python_version: '3.6'
38-
Python_37_Mac:
38+
py37:
3939
python_version: '3.7'
4040

4141
- template: etc/ci/azure-posix.yml
4242
parameters:
4343
name: macOS_1014
4444
image_name: macos-10.14
4545
matrix:
46-
Python_27_Mac:
46+
py27:
4747
python_version: '2.7'
48-
Python_36_Mac:
48+
py36:
4949
python_version: '3.6'
50-
Python_37_Mac:
50+
py37:
5151
python_version: '3.7'
5252

5353
- template: etc/ci/azure-win.yml
5454
parameters:
55-
name: Windows_2016_32
55+
name: Win_2016_32
5656
image_name: vs2017-win2016
5757
matrix:
58-
Python_27_Win32:
58+
py27:
5959
python_version: '2.7'
6060
python_architecture: 'x86'
61-
Python_36_Win32:
61+
py36:
6262
python_version: '3.6'
6363
python_architecture: 'x86'
64-
Python_37_Win32:
64+
py37:
6565
python_version: '3.7.3'
6666
python_architecture: 'x86'
6767

6868
- template: etc/ci/azure-win.yml
6969
parameters:
70-
name: Windows_2016_64
70+
name: Win_2016_64
7171
image_name: vs2017-win2016
7272
matrix:
73-
Python_27_Win64:
73+
py27:
7474
python_version: '2.7'
7575
python_architecture: 'x64'
76-
Python_36_Win64:
76+
py36:
7777
python_version: '3.6'
7878
python_architecture: 'x64'
79-
Python_37_Win64:
79+
py37:
8080
python_version: '3.7'
8181
python_architecture: 'x64'
8282

@@ -211,19 +211,19 @@ jobs:
211211
# make -j8
212212
# sudo make altinstall
213213
#
214-
# - template: etc/ci/azure-container-rpm.yml
215-
# parameters:
216-
# name: Fedora_30_py27
217-
# container: 'fedora:30'
218-
# package_manager: dnf
219-
# python_path: 'python2.7'
220-
# install_python: sudo dnf install -y python python27-devel
221-
#
222-
# - template: etc/ci/azure-container-rpm.yml
223-
# parameters:
224-
# name: Fedora_30_py36
225-
# container: 'fedora:30'
226-
# package_manager: dnf
227-
# python_path: 'python3.6'
228-
# install_python: sudo dnf install -y python36 python36-devel python36-virtualenv
229-
#
214+
- template: etc/ci/azure-container-rpm.yml
215+
parameters:
216+
name: Fedora_30_py27
217+
container: 'fedora:30'
218+
package_manager: dnf
219+
python_path: 'python2.7'
220+
install_python: sudo dnf install -y python python27-devel
221+
222+
- template: etc/ci/azure-container-rpm.yml
223+
parameters:
224+
name: Fedora_30_py36
225+
container: 'fedora:30'
226+
package_manager: dnf
227+
python_path: 'python3.6'
228+
install_python: sudo dnf install -y python36 python36-devel python36-virtualenv
229+

etc/ci/azure-container-rpm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ parameters:
66
install_python: ''
77
install_packages: |
88
set -e -x
9-
sudo yum groupinstall -y development
9+
sudo yum groupinstall -y "Development Tools"
1010
sudo yum install -y \
1111
openssl openssl-devel \
1212
sqlite-devel zlib-devel xz-devel bzip2-devel \

0 commit comments

Comments
 (0)