SYNERGY3-150 Fix unstable build for windows core (#7148)
* SYNERGY3-150 Minor change to core build script * SYNERGY3-150 Missing line continuation * SYNERGY3-150 Re-enable flags * SYNERGY-150 Disable on PR * SYNERGY3-150 Changelog
This commit is contained in:
parent
d3d7c36f58
commit
9eb536a50a
3 changed files with 12 additions and 7 deletions
5
.github/workflows/aws-upload-windows.yml
vendored
5
.github/workflows/aws-upload-windows.yml
vendored
|
|
@ -50,7 +50,10 @@ jobs:
|
||||||
cd build
|
cd build
|
||||||
cmake -DCMAKE_BUILD_TYPE=Release ..
|
cmake -DCMAKE_BUILD_TYPE=Release ..
|
||||||
. ./version
|
. ./version
|
||||||
msbuild synergy-core.sln /p:Configuration=Release
|
msbuild synergy-core.sln `
|
||||||
|
/p:Platform="x64" `
|
||||||
|
/p:Configuration=Release `
|
||||||
|
/m
|
||||||
|
|
||||||
- uses: anshulrgoyal/upload-s3-action@master
|
- uses: anshulrgoyal/upload-s3-action@master
|
||||||
if: "github.event_name == 'release'"
|
if: "github.event_name == 'release'"
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,9 @@ 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
|
||||||
|
|
||||||
|
Github Actions:
|
||||||
|
- #7148 Fix unstable build for windows core
|
||||||
===========
|
===========
|
||||||
|
|
||||||
v1.14.3-snapshot
|
v1.14.3-snapshot
|
||||||
|
|
|
||||||
|
|
@ -95,16 +95,15 @@ New-Item `
|
||||||
Push-Location $env:SYNERGY_BUILD_DIRECTORY
|
Push-Location $env:SYNERGY_BUILD_DIRECTORY
|
||||||
Try {
|
Try {
|
||||||
cmake `
|
cmake `
|
||||||
-G "Visual Studio 16 2019" `
|
|
||||||
-DCMAKE_BUILD_TYPE=$env:SYNERGY_BUILD_TYPE `
|
-DCMAKE_BUILD_TYPE=$env:SYNERGY_BUILD_TYPE `
|
||||||
..
|
..
|
||||||
|
. ./version
|
||||||
msbuild synergy-core.sln `
|
msbuild synergy-core.sln `
|
||||||
/p:Platform="x64" `
|
|
||||||
/p:Configuration=$env:SYNERGY_BUILD_TYPE `
|
/p:Configuration=$env:SYNERGY_BUILD_TYPE `
|
||||||
/m `
|
/p:Platform="x64" `
|
||||||
/t:synergys `
|
/m
|
||||||
/t:synergyc
|
|
||||||
|
Remove-Item -Force -Path "synergy-core-win-x64.zip" -ErrorAction SilentlyContinue
|
||||||
Compress-Archive `
|
Compress-Archive `
|
||||||
-Path ".\bin\${env:SYNERGY_BUILD_TYPE}\*" `
|
-Path ".\bin\${env:SYNERGY_BUILD_TYPE}\*" `
|
||||||
-DestinationPath "synergy-core-win-x64.zip"
|
-DestinationPath "synergy-core-win-x64.zip"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue