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

SYNERGY-400 Unify artifacts names (#6896)

Browse source 
* SYNERGY-400 Unify artifacts names

* SYNEGY-400 Check stage during tag creation
This commit is contained in:
SerhiiGadzhilov 2020-12-31 17:27:15 +03:00 committed by GitHub
parent bdb8f7672c
commit 6fa21224a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 70 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
.github/actions/build-number/build-number.js vendored
View file

@ -17,6 +17,10 @@ function VersionPart(part) {
return m_number; return m_number;
} }
self.getSuffix = function(){
return m_suffix;
}
self.toString = function() { self.toString = function() {
return m_prefix + m_number.toString() + m_suffix; return m_prefix + m_number.toString() + m_suffix;
} }
@ -93,6 +97,7 @@ function Version(version) {
m_minor.setPart(versionParts[1]); m_minor.setPart(versionParts[1]);
m_build.setPart(versionParts[2]); m_build.setPart(versionParts[2]);
m_patch.setNumber(m_build.getNumber()); m_patch.setNumber(m_build.getNumber());
m_build.setNumber(0);
} }
else if (versionParts.length == 4) { else if (versionParts.length == 4) {
m_major.setPart(versionParts[0]); m_major.setPart(versionParts[0]);
@ -117,10 +122,15 @@ function Version(version) {
return m_patch.getNumber(); return m_patch.getNumber();
} }
this.getStage = function(){
return m_build.getSuffix();
}
this.isSamePatch = function(version) { this.isSamePatch = function(version) {
return (m_major.getNumber() == version.getMajor() && return (this.getMajor() == version.getMajor() &&
m_minor.getNumber() == version.getMinor() && this.getMinor() == version.getMinor() &&
m_patch.getNumber() == version.getPatch()); this.getPatch() == version.getPatch() &&
this.getStage() == version.getStage());
} }
init(); init();

2
.github/workflows/job-sonarcloud.yml vendored
View file

@ -3,7 +3,7 @@ name: SonarCloud Static Analysis
on: on:
push: push:
branches: [ master ] branches: [ master ]
pull_request_target: pull_request:
branches: [ master ] branches: [ master ]
jobs: jobs:

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

@ -58,8 +58,8 @@ steps:
. ./build-release/version . ./build-release/version
SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH" SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH"
SYNERGY_REVISION=`git rev-parse --short=8 HEAD` SYNERGY_REVISION=`git rev-parse --short=8 HEAD`
SYNERGY_DEB_VERSION="${SYNERGY_VERSION}.${SYNERGY_VERSION_STAGE}~b$(Build.BuildNumber)+${SYNERGY_REVISION}" SYNERGY_DEB_VERSION="${SYNERGY_VERSION}.${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}"
SYNERGY_RPM_VERSION="${SYNERGY_VERSION}-$(Build.BuildNumber).${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}" SYNERGY_RPM_VERSION="${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}"
echo "##vso[task.setvariable variable=SYNERGY_VERSION_BUILD]${SYNERGY_VERSION_BUILD}" echo "##vso[task.setvariable variable=SYNERGY_VERSION_BUILD]${SYNERGY_VERSION_BUILD}"
echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}" echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}"
echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}"
@ -75,7 +75,7 @@ steps:
mkdir standard_package mkdir standard_package
cd .. cd ..
filename=$(ls synergy_*.deb) filename=$(ls synergy_*.deb)
filename_new="synergy_${SYNERGY_DEB_VERSION}_$(name)${filename##*${SYNERGY_REVISION}}" filename_new="synergy_${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}_$(name)${filename##*${SYNERGY_REVISION}}"
mv $filename $(Build.Repository.LocalPath)/standard_package/$filename_new mv $filename $(Build.Repository.LocalPath)/standard_package/$filename_new
cd $(Build.Repository.LocalPath)/standard_package cd $(Build.Repository.LocalPath)/standard_package
md5sum $filename_new >> ${filename_new}.checksum.txt md5sum $filename_new >> ${filename_new}.checksum.txt
@ -95,7 +95,7 @@ steps:
mkdir enterprise_package mkdir enterprise_package
cd .. cd ..
filename=$(ls synergy_*.deb) filename=$(ls synergy_*.deb)
filename_new="synergy-enterprise_$(SYNERGY_DEB_VERSION)_$(name)${filename##*$(SYNERGY_REVISION)}" filename_new="synergy-enterprise_${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}_$(name)${filename##*$(SYNERGY_REVISION)}"
mv $filename $(Build.Repository.LocalPath)/enterprise_package/$filename_new mv $filename $(Build.Repository.LocalPath)/enterprise_package/$filename_new
cd $(Build.Repository.LocalPath)/enterprise_package cd $(Build.Repository.LocalPath)/enterprise_package
md5sum $filename_new >> ${filename_new}.checksum.txt md5sum $filename_new >> ${filename_new}.checksum.txt
@ -112,14 +112,14 @@ steps:
make install/strip make install/strip
cd rpm cd rpm
rpmbuild -bb --define "_topdir $(pwd)" --buildroot $(pwd)/BUILDROOT synergy.spec rpmbuild -bb --define "_topdir $(pwd)" --buildroot $(pwd)/BUILDROOT synergy.spec
rpmlint --verbose RPMS/x86_64/*.rpm rpmlint --verbose RPMS/*.rpm
cd RPMS/x86_64 cd RPMS
filename=$(ls *.rpm) filename=$(ls *.rpm)
md5sum $filename >> ${filename}.checksum.txt md5sum $filename >> ${filename}.checksum.txt
sha1sum $filename >> ${filename}.checksum.txt sha1sum $filename >> ${filename}.checksum.txt
sha256sum $filename >> ${filename}.checksum.txt sha256sum $filename >> ${filename}.checksum.txt
cd .. cd ..
mv x86_64 $(Build.Repository.LocalPath)/standard_package mv RPMS $(Build.Repository.LocalPath)/standard_package
displayName: "Package Binary RPM(standard)" displayName: "Package Binary RPM(standard)"
condition: eq(variables['packager'],'rpm') condition: eq(variables['packager'],'rpm')
env: env:
@ -129,15 +129,15 @@ steps:
cd build-ent cd build-ent
make install/strip make install/strip
cd rpm cd rpm
rpmbuild -bb --define "_topdir $(pwd)" --buildroot $(pwd)/BUILDROOT synergy.spec rpmbuild -bb --define "_topdir $(pwd)" --buildroot $(pwd)/BUILDROOT synergy-enterprise.spec
rpmlint --verbose RPMS/x86_64/*.rpm rpmlint --verbose RPMS/*.rpm
cd RPMS/x86_64 cd RPMS
filename=$(ls *.rpm) filename=$(ls *.rpm)
md5sum $filename >> ${filename}.checksum.txt md5sum $filename >> ${filename}.checksum.txt
sha1sum $filename >> ${filename}.checksum.txt sha1sum $filename >> ${filename}.checksum.txt
sha256sum $filename >> ${filename}.checksum.txt sha256sum $filename >> ${filename}.checksum.txt
cd .. cd ..
mv x86_64 $(Build.Repository.LocalPath)/enterprise_package mv RPMS $(Build.Repository.LocalPath)/enterprise_package
ls -la ls -la
displayName: "Package Binary RPM(enterprise)" displayName: "Package Binary RPM(enterprise)"
condition: eq(variables['packager'],'rpm') condition: eq(variables['packager'],'rpm')

4
CI/MacOS/mac-build.yml
View file

@ -75,8 +75,8 @@ steps:
. ./build/version . ./build/version
SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH" SYNERGY_VERSION="$SYNERGY_VERSION_MAJOR.$SYNERGY_VERSION_MINOR.$SYNERGY_VERSION_PATCH"
SYNERGY_REVISION=`git rev-parse --short=8 HEAD` SYNERGY_REVISION=`git rev-parse --short=8 HEAD`
SYNERGY_DMG_VERSION="${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}_b$(Build.BuildNumber)-${SYNERGY_REVISION}" SYNERGY_DMG_VERSION="${SYNERGY_VERSION}-${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}"
SYNERGY_DMG_FILENAME=$(prefix)_v${SYNERGY_DMG_VERSION}_macos_$(platform).dmg SYNERGY_DMG_FILENAME=$(prefix)_${SYNERGY_DMG_VERSION}_macos_$(platform).dmg
echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}" echo "##vso[task.setvariable variable=SYNERGY_VERSION_STAGE]${SYNERGY_VERSION_STAGE}"
echo "##vso[task.setvariable variable=SYNERGY_VERSION_BUILD]${SYNERGY_VERSION_BUILD}" echo "##vso[task.setvariable variable=SYNERGY_VERSION_BUILD]${SYNERGY_VERSION_BUILD}"
echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}" echo "##vso[task.setvariable variable=SYNERGY_VERSION]${SYNERGY_VERSION}"

5
CI/Windows/windows-build.yml
View file

@ -177,17 +177,16 @@ steps:
echo ##vso[task.setvariable variable=SYNERGY_VERSION]%SYNERGY_VERSION% echo ##vso[task.setvariable variable=SYNERGY_VERSION]%SYNERGY_VERSION%
echo ##vso[task.setvariable variable=SYNERGY_REVISION]%SYNERGY_REVISION% echo ##vso[task.setvariable variable=SYNERGY_REVISION]%SYNERGY_REVISION%
displayName: "Set Variables" displayName: "Set Variables"
condition: eq(variables['Build.SourceBranch'], 'refs/heads/master')
- script: | - script: |
cd $(Build.Repository.LocalPath)\build32\installer\bin\Release\ cd $(Build.Repository.LocalPath)\build32\installer\bin\Release\
set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_REVISION)_windows_x86.msi set FILENAME=$(prefix)_$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE).$(SYNERGY_REVISION)_windows_x86.msi
ren "Synergy.msi" "%FILENAME%" ren "Synergy.msi" "%FILENAME%"
$(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt
$(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt
$(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha256 %FILENAME% >> %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha256 %FILENAME% >> %FILENAME%.checksum.txt
cd $(Build.Repository.LocalPath)\build64\installer\bin\Release\ cd $(Build.Repository.LocalPath)\build64\installer\bin\Release\
set FILENAME=$(prefix)_v$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE)_$(Build.BuildNumber).$(SYNERGY_REVISION)_windows_x64.msi set FILENAME=$(prefix)_$(SYNERGY_VERSION)-$(SYNERGY_VERSION_STAGE).$(SYNERGY_REVISION)_windows_x64.msi
ren "Synergy.msi" "%FILENAME%" ren "Synergy.msi" "%FILENAME%"
$(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe md5 %FILENAME% > %FILENAME%.checksum.txt
$(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt $(Build.Repository.LocalPath)\ext\openssl\windows\x64\bin\openssl.exe sha1 %FILENAME% >> %FILENAME%.checksum.txt

4
ChangeLog
View file

@ -1,3 +1,7 @@
v1.13.1-snapshot
===========
===========
v1.13.0-stable v1.13.0-stable
=========== ===========
Bug fixes: Bug fixes:

6
azure-pipelines.yml
View file

@ -67,13 +67,13 @@ jobs:
catalina-std: catalina-std:
image: macOS-10.15 image: macOS-10.15
platform: x86-64 platform: x86-64
version: 10.15 version: 10.14
buildType: "standard" buildType: "standard"
prefix: "synergy" prefix: "synergy"
catalina-ent: catalina-ent:
image: macOS-10.15 image: macOS-10.15
platform: x86-64 platform: x86-64
version: 10.15 version: 10.14
buildType: "enterprise" buildType: "enterprise"
prefix: "synergy-enterprise" prefix: "synergy-enterprise"
pool: pool:
@ -98,7 +98,7 @@ jobs:
vs2019ent: vs2019ent:
image: windows-2019 image: windows-2019
buildType: "enterprise" buildType: "enterprise"
prefix: "synergy_enterprise" prefix: "synergy-enterprise"
pool: pool:
vmImage: $[ variables['image'] ] vmImage: $[ variables['image'] ]

4
cmake/Version.cmake
View file

@ -6,9 +6,9 @@ cmake_minimum_required (VERSION 3.4)
set (SYNERGY_VERSION_MAJOR 1) set (SYNERGY_VERSION_MAJOR 1)
set (SYNERGY_VERSION_MINOR 13) set (SYNERGY_VERSION_MINOR 13)
set (SYNERGY_VERSION_PATCH 0) set (SYNERGY_VERSION_PATCH 1)
set (SYNERGY_VERSION_BUILD 1) set (SYNERGY_VERSION_BUILD 1)
set (SYNERGY_VERSION_STAGE "stable") set (SYNERGY_VERSION_STAGE "snapshot")
# #
# Version from CI # Version from CI

29
dist/rpm/synergy-enterprise.spec.in vendored Normal file
View file

@ -0,0 +1,29 @@
%define _rpmfilename %%{NAME}_%%{Version}-%%{Release}.rpm
Name: synergy-enterprise
Version: @SYNERGY_VERSION@
Summary: Keyboard and mouse sharing solution
Group: Applications/Productivity
URL: https://symless.com/synergy
Source: https://symless.com/synergy/downloads
Vendor: Symless
Packager: Symless <engineering@symless.com>
License: GPLv2
Release: @SYNERGY_SNAPSHOT_INFO@%{?dist}
%description
Synergy allows you to share one mouse and keyboard between multiple computers.
Work seamlessly across Windows, macOS and Linux.
%files
%defattr(755,root,root,-)
%{_bindir}/synergy
%{_bindir}/synergyc
%{_bindir}/synergys
%{_bindir}/syntool
%attr(644,-,-) %{_datarootdir}/applications/synergy.desktop
%attr(644,-,-) %{_datarootdir}/icons/hicolor/scalable/apps/synergy.svg
%changelog
* Wed Apr 26 2017 Symless <engineering@symless.com>
- Initial version of the package

4
dist/rpm/synergy.spec.in vendored
View file

@ -1,3 +1,5 @@
%define _rpmfilename %%{NAME}_%%{VERSION}-%%{RELEASE}.rpm
Name: synergy Name: synergy
Version: @SYNERGY_VERSION@ Version: @SYNERGY_VERSION@
Summary: Keyboard and mouse sharing solution Summary: Keyboard and mouse sharing solution
@ -7,7 +9,7 @@ Source: https://symless.com/synergy/downloads
Vendor: Symless Vendor: Symless
Packager: Symless <engineering@symless.com> Packager: Symless <engineering@symless.com>
License: GPLv2 License: GPLv2
Release: @SYNERGY_VERSION_BUILD@@SYNERGY_SNAPSHOT_INFO@%{?dist} Release: @SYNERGY_SNAPSHOT_INFO@%{?dist}
%description %description
Synergy allows you to share one mouse and keyboard between multiple computers. Synergy allows you to share one mouse and keyboard between multiple computers.