smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SYNERGY-661 Fix Ubuntu 16.04 pipeline in Azure

Browse source
This commit is contained in:
Serhii Hadzhilov 2021-05-21 10:12:36 +03:00
parent 2569409ba2
commit 28b74204be
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CI/Linux/linux-build.yml
View file

@ -8,7 +8,7 @@ steps:
cd build-release cd build-release
if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release ..; else cmake -DCMAKE_BUILD_TYPE=Release ..; fi
. ./version . ./version
make -j make -j$(makeJobsLimit)
condition: eq(variables['packager'],'deb') condition: eq(variables['packager'],'deb')
displayName: 'Build Release deb' displayName: 'Build Release deb'
env: env:
@ -22,7 +22,7 @@ steps:
else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..; else cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
fi fi
. ./version . ./version
make -j make -j$(makeJobsLimit)
condition: eq(variables['packager'],'rpm') condition: eq(variables['packager'],'rpm')
displayName: 'Build Release rpm' displayName: 'Build Release rpm'
env: env:
@ -34,7 +34,7 @@ steps:
export SYNERGY_ENTERPRISE=1 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 if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON ..; fi
. ./version . ./version
make -j make -j$(makeJobsLimit)
displayName: 'Build enterprise' displayName: 'Build enterprise'
condition: eq(variables['packager'],'deb') condition: eq(variables['packager'],'deb')
env: env:
@ -48,7 +48,7 @@ steps:
else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_ENTERPRISE=ON -DCMAKE_INSTALL_PREFIX:PATH=$(pwd)/rpm/BUILDROOT/usr ..;
fi fi
. ./version . ./version
make -j make -j$(makeJobsLimit)
condition: eq(variables['packager'],'rpm') condition: eq(variables['packager'],'rpm')
displayName: 'Build enterprise rpm' displayName: 'Build enterprise rpm'
env: env:

1
azure-pipelines.yml
View file

@ -14,6 +14,7 @@ jobs:
image: symless/synergy-core:ubuntu16.04 image: symless/synergy-core:ubuntu16.04
packager: deb packager: deb
name: ubuntu16 name: ubuntu16
makeJobsLimit: 1
ubuntu1804: ubuntu1804:
image: symless/synergy-core:ubuntu18.04 image: symless/synergy-core:ubuntu18.04
packager: deb packager: deb

4
src/gui/src/main.cpp
View file

@ -56,7 +56,11 @@ int main(int argc, char* argv[])
/* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */ /* Workaround for QTBUG-40332 - "High ping when QNetworkAccessManager is instantiated" */
::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1); ::setenv ("QT_BEARER_POLL_TIMEOUT", "-1", 1);
#endif #endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
QCoreApplication::setOrganizationName("Synergy"); QCoreApplication::setOrganizationName("Synergy");
QCoreApplication::setOrganizationDomain("http://symless.com/"); QCoreApplication::setOrganizationDomain("http://symless.com/");
QCoreApplication::setApplicationName("Synergy"); QCoreApplication::setApplicationName("Synergy");