#6743 Enabled all os's again

This commit is contained in:
Jamie Newbon 2020-08-11 11:14:44 +01:00
parent 77891d9168
commit 9d89a05427

View file

@ -22,34 +22,34 @@ jobs:
image: symless/synergy-core:ubuntu20.04 image: symless/synergy-core:ubuntu20.04
packager: deb packager: deb
name: ubuntu20 name: ubuntu20
# debian9: debian9:
# image: symless/synergy-core:debian9 image: symless/synergy-core:debian9
# packager: deb packager: deb
# name: debian9 name: debian9
# debian10: debian10:
# image: symless/synergy-core:debian10 image: symless/synergy-core:debian10
# packager: deb packager: deb
# name: debian10 name: debian10
# fedora28: fedora28:
# image: symless/synergy-core:fedora28 image: symless/synergy-core:fedora28
# packager: rpm packager: rpm
# name: fedora28 name: fedora28
# fedora29: fedora29:
# image: symless/synergy-core:fedora29 image: symless/synergy-core:fedora29
# packager: rpm packager: rpm
# name: fedora29 name: fedora29
# fedora30: fedora30:
# image: symless/synergy-core:fedora30 image: symless/synergy-core:fedora30
# packager: rpm packager: rpm
# name: fedora30 name: fedora30
# centos7.6: centos7.6:
# image: symless/synergy-core:centos7.6 image: symless/synergy-core:centos7.6
# packager: rpm packager: rpm
# name: centos76 name: centos76
# centos8: centos8:
# image: symless/synergy-core:centos8 image: symless/synergy-core:centos8
# packager: rpm packager: rpm
# name: centos8 name: centos8
container: $[ variables['image'] ] container: $[ variables['image'] ]
@ -57,67 +57,67 @@ jobs:
- template: CI/checkout.yml - template: CI/checkout.yml
- template: CI/Linux/linux-build.yml - template: CI/Linux/linux-build.yml
# - job: MacOS - job: MacOS
# strategy: strategy:
# matrix: matrix:
# mojave-std: mojave-std:
# image: macOS-10.14 image: macOS-10.14
# name: mojave name: mojave
# version: 10.12 version: 10.12
# buildType: "standard" buildType: "standard"
# prefix: "synergy" prefix: "synergy"
# mojave-ent: mojave-ent:
# image: macOS-10.14 image: macOS-10.14
# name: mojave name: mojave
# version: 10.12 version: 10.12
# buildType: "enterprise" buildType: "enterprise"
# prefix: "synergy-enterprise" prefix: "synergy-enterprise"
# catalina-std: catalina-std:
# image: macOS-10.15 image: macOS-10.15
# name: catalina name: catalina
# version: 10.14 version: 10.14
# buildType: "standard" buildType: "standard"
# prefix: "synergy" prefix: "synergy"
# catalina-ent: catalina-ent:
# image: macOS-10.15 image: macOS-10.15
# name: catalina name: catalina
# version: 10.14 version: 10.14
# buildType: "enterprise" buildType: "enterprise"
# prefix: "synergy-enterprise" prefix: "synergy-enterprise"
# pool: pool:
# vmImage: $[ variables['image'] ] vmImage: $[ variables['image'] ]
#
# variables: variables:
# QT_PATH: '/usr/local/opt/qt/bin' QT_PATH: '/usr/local/opt/qt/bin'
#
# steps: steps:
# - template: CI/checkout.yml - template: CI/checkout.yml
# - template: CI/MacOS/mac-build.yml - template: CI/MacOS/mac-build.yml
#
# - job: Windows - job: Windows
# strategy: strategy:
# matrix: matrix:
# vs2019: vs2019:
# image: windows-2019 image: windows-2019
# buildType: "standard" buildType: "standard"
# prefix: "synergy" prefix: "synergy"
# vs2019ent: vs2019ent:
# image: windows-2019 image: windows-2019
# buildType: "enterprise" buildType: "enterprise"
# prefix: "synergy_enterprise" prefix: "synergy_enterprise"
#
# pool: pool:
# vmImage: $[ variables['image'] ] vmImage: $[ variables['image'] ]
#
# variables: variables:
# QT_VERSION: '5.12.6' QT_VERSION: '5.12.6'
# QLI_OUT_DIR: '.\deps\Qt' QLI_OUT_DIR: '.\deps\Qt'
# QLI_BASE_URL: 'http://qt.mirror.constant.com/' QLI_BASE_URL: 'http://qt.mirror.constant.com/'
# QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64' QT_BIN_PATH: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017_64'
# QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017' QT_BIN_PATH_32: '$(Build.Repository.LocalPath)\$(QLI_OUT_DIR)\$(QT_VERSION)\msvc2017'
# BONJOUR_SDK_DIR: 'deps\BonjourSDK' BONJOUR_SDK_DIR: 'deps\BonjourSDK'
# ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd' ENV_BAT: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\Tools\vsdevcmd'
#
# steps: steps:
# - template: CI/checkout.yml - template: CI/checkout.yml
# - template: CI/Windows/windows-build.yml - template: CI/Windows/windows-build.yml