SYNERGY-661 Fix Ubuntu 16.04 pipeline in Azure
This commit is contained in:
parent
2569409ba2
commit
28b74204be
3 changed files with 9 additions and 4 deletions
|
|
@ -8,7 +8,7 @@ steps:
|
|||
cd build-release
|
||||
if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi
|
||||
. ./version
|
||||
make -j
|
||||
make -j$(makeJobsLimit)
|
||||
condition: eq(variables['packager'],'deb')
|
||||
displayName: 'Build Release deb'
|
||||
env:
|
||||
|
|
@ -22,7 +22,7 @@ steps:
|
|||
else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
|
||||
fi
|
||||
. ./version
|
||||
make -j
|
||||
make -j$(makeJobsLimit)
|
||||
condition: eq(variables['packager'],'rpm')
|
||||
displayName: 'Build Release rpm'
|
||||
env:
|
||||
|
|
@ -34,7 +34,7 @@ steps:
|
|||
export SYNERGY_ENTERPRISE=1
|
||||
if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; fi
|
||||
. ./version
|
||||
make -j
|
||||
make -j$(makeJobsLimit)
|
||||
displayName: 'Build enterprise'
|
||||
condition: eq(variables['packager'],'deb')
|
||||
env:
|
||||
|
|
@ -48,7 +48,7 @@ steps:
|
|||
else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
|
||||
fi
|
||||
. ./version
|
||||
make -j
|
||||
make -j$(makeJobsLimit)
|
||||
condition: eq(variables['packager'],'rpm')
|
||||
displayName: 'Build enterprise rpm'
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ jobs:
|
|||
image: symless/synergy-core:ubuntu16.04
|
||||
packager: deb
|
||||
name: ubuntu16
|
||||
makeJobsLimit: 1
|
||||
ubuntu1804:
|
||||
image: symless/synergy-core:ubuntu18.04
|
||||
packager: deb
|
||||
|
|
|
|||
|
|
@ -56,7 +56,11 @@ int main(int argc, char* argv[])
|
|||
/* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */
|
||||
::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1);
|
||||
#endif
|
||||
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
|
||||
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
|
||||
#endif
|
||||
|
||||
QCoreApplication::setOrganizationName("Synergy");
|
||||
QCoreApplication::setOrganizationDomain("http://symless.com/");
|
||||
QCoreApplication::setApplicationName("Synergy");
|
||||
|
|
|
|||
Loading…
Reference in a new issue