SYNERGY3-203 Build fix (#7160)
* SYNERGY3-203 Fix azure pipelines * SYNERGY3-203 Fix raspberry pi build * SYNERGY3-203 Fix Linux build * SYNERGY3-203 Update ChangeLog.txt
This commit is contained in:
parent
8be2e89c81
commit
8ea7d05d85
4 changed files with 5 additions and 4 deletions
|
|
@ -6,9 +6,10 @@ on:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-on-pi:
|
build-on-pi:
|
||||||
runs-on: [[self-hosted, linux, ARM, pi-3], [self-hosted, linux, ARM64, pi-4]]
|
runs-on: ${{ matrix.os }}
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
|
os: [[self-hosted, linux, ARM, pi-3], [self-hosted, linux, ARM64, pi-4]]
|
||||||
include:
|
include:
|
||||||
- name: "synergy"
|
- name: "synergy"
|
||||||
remote_folder: "v1-core-standard"
|
remote_folder: "v1-core-standard"
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ steps:
|
||||||
GIT_COMMIT: $(Build.SourceVersion)
|
GIT_COMMIT: $(Build.SourceVersion)
|
||||||
|
|
||||||
- script: |
|
- script: |
|
||||||
mkdir build-bussiness
|
mkdir build-business
|
||||||
cd build-business
|
cd build-business
|
||||||
export SYNERGY_BUSINESS=1
|
export SYNERGY_BUSINESS=1
|
||||||
if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_BUSINESS=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_BUSINESS=ON ..; fi
|
if [ -z $(which cmake) ]; then cmake3 -DCMAKE_BUILD_TYPE=Release -DSYNERGY_BUSINESS=ON ..; else cmake -DCMAKE_BUILD_TYPE=Release -DSYNERGY_BUSINESS=ON ..; fi
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ v1.14.4-snapshot
|
||||||
===========
|
===========
|
||||||
Enhancements:
|
Enhancements:
|
||||||
- #7143 Add ability to stop synergy on the login screen
|
- #7143 Add ability to stop synergy on the login screen
|
||||||
- #7157 Synergy business accepts only business licenses
|
- #7157 | #7160 Synergy business accepts only business licenses
|
||||||
|
|
||||||
Github Actions:
|
Github Actions:
|
||||||
- #7148 Fix unstable build for windows core
|
- #7148 Fix unstable build for windows core
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ jobs:
|
||||||
version: 10.14
|
version: 10.14
|
||||||
buildType: "enterprise"
|
buildType: "enterprise"
|
||||||
prefix: "synergy-enterprise"
|
prefix: "synergy-enterprise"
|
||||||
catalina-ent:
|
catalina-business:
|
||||||
image: macOS-10.15
|
image: macOS-10.15
|
||||||
platform: x86-64
|
platform: x86-64
|
||||||
version: 10.14
|
version: 10.14
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue