From 8ea7d05d85c39f1654376510ef336d996bd713a3 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov <71632867+SerhiiGadzhilov@users.noreply.github.com> Date: Tue, 26 Apr 2022 18:48:43 +0300 Subject: [PATCH] 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 --- .github/workflows/job-build-raspberry-pi.yaml | 3 ++- CI/Linux/linux-build.yml | 2 +- ChangeLog | 2 +- azure-pipelines.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/job-build-raspberry-pi.yaml b/.github/workflows/job-build-raspberry-pi.yaml index dff1791cb..7716edcad 100644 --- a/.github/workflows/job-build-raspberry-pi.yaml +++ b/.github/workflows/job-build-raspberry-pi.yaml @@ -6,9 +6,10 @@ on: jobs: build-on-pi: - runs-on: [[self-hosted, linux, ARM, pi-3], [self-hosted, linux, ARM64, pi-4]] + runs-on: ${{ matrix.os }} strategy: matrix: + os: [[self-hosted, linux, ARM, pi-3], [self-hosted, linux, ARM64, pi-4]] include: - name: "synergy" remote_folder: "v1-core-standard" diff --git a/CI/Linux/linux-build.yml b/CI/Linux/linux-build.yml index bb0897aca..4f869fa7f 100644 --- a/CI/Linux/linux-build.yml +++ b/CI/Linux/linux-build.yml @@ -55,7 +55,7 @@ steps: GIT_COMMIT: $(Build.SourceVersion) - script: | - mkdir build-bussiness + mkdir build-business cd build-business 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 diff --git a/ChangeLog b/ChangeLog index cfb3c0767..1b566a378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ v1.14.4-snapshot =========== Enhancements: - #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: - #7148 Fix unstable build for windows core diff --git a/azure-pipelines.yml b/azure-pipelines.yml index badad795d..4fba14f19 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -85,7 +85,7 @@ jobs: version: 10.14 buildType: "enterprise" prefix: "synergy-enterprise" - catalina-ent: + catalina-business: image: macOS-10.15 platform: x86-64 version: 10.14