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

Add stage to file name (#6946)

Browse source 
* Add stage to file name

* ChangeLog

* Update issue number

* Fix debian control file for enterprise

* Fix enterprise check
This commit is contained in:
Kyle Bloom 2021-02-10 19:01:44 +00:00 committed by GitHub
parent 8b26dd3495
commit d072b5064b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.github/workflows/job-build-raspberry-pi.yaml vendored
View file

@ -23,12 +23,11 @@ jobs:
id: version id: version
run: | run: |
python3 CI/build_version.py python3 CI/build_version.py
mkdir -p version-info; cd version-info mkdir -p version-info && cd version-info && cmake .. && cd ..
cmake ..
cd ..
. ./version-info/version . ./version-info/version
rm -rf version-info
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}.${SYNERGY_REVISION}" SYNERGY_DEB_VERSION="${SYNERGY_VERSION}.${SYNERGY_VERSION_STAGE}.${SYNERGY_REVISION}"
echo "::set-output name=SYNERGY_VERSION_MAJOR::${SYNERGY_VERSION_MAJOR}" echo "::set-output name=SYNERGY_VERSION_MAJOR::${SYNERGY_VERSION_MAJOR}"
echo "::set-output name=SYNERGY_VERSION_MINOR::${SYNERGY_VERSION_MINOR}" echo "::set-output name=SYNERGY_VERSION_MINOR::${SYNERGY_VERSION_MINOR}"
@ -38,7 +37,7 @@ jobs:
echo "::set-output name=SYNERGY_VERSION::${SYNERGY_VERSION}" echo "::set-output name=SYNERGY_VERSION::${SYNERGY_VERSION}"
echo "::set-output name=SYNERGY_REVISION::${SYNERGY_REVISION}" echo "::set-output name=SYNERGY_REVISION::${SYNERGY_REVISION}"
echo "::set-output name=SYNERGY_DEB_VERSION::${SYNERGY_DEB_VERSION}" echo "::set-output name=SYNERGY_DEB_VERSION::${SYNERGY_DEB_VERSION}"
if [$SYNERGY_ENTERPRISE == '1'] if [ "$SYNERGY_ENTERPRISE" == '1' ]
then then
echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-enterprise/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}"
echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy-enterprise" echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy-enterprise"
@ -46,7 +45,6 @@ jobs:
echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}" echo "::set-output name=SYNERGY_REMOTE_FOLDER::synergy-core/v1-core-standard/${SYNERGY_VERSION}/${SYNERGY_VERSION_STAGE}/b${SYNERGY_VERSION_BUILD}-${SYNERGY_REVISION}"
echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy" echo "::set-output name=SYNERGY_PACKAGE_NAME::synergy"
fi fi
rm -rf version-info
- name: Build deb - name: Build deb
env: env:
@ -54,9 +52,10 @@ jobs:
SYNERGY_REVISION: ${{ steps.version.outputs.SYNERGY_REVISION }} SYNERGY_REVISION: ${{ steps.version.outputs.SYNERGY_REVISION }}
SYNERGY_DEB_VERSION: ${{ steps.version.outputs.SYNERGY_DEB_VERSION }} SYNERGY_DEB_VERSION: ${{ steps.version.outputs.SYNERGY_DEB_VERSION }}
PACKAGE_NAME: ${{ steps.version.outputs.SYNERGY_PACKAGE_NAME }} PACKAGE_NAME: ${{ steps.version.outputs.SYNERGY_PACKAGE_NAME }}
SYNERGY_VERSION_STAGE: ${{ steps.version.outputs.SYNERGY_VERSION_STAGE }}
run: | run: |
sed -i "s/ synergy/ ${PACKAGE_NAME}/g" ./debian/control
dch --create --package "${PACKAGE_NAME}" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release" dch --create --package "${PACKAGE_NAME}" --controlmaint --distribution unstable --newversion $SYNERGY_DEB_VERSION "Initial release"
export GPG_TTY=$(tty)
debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc debuild --preserve-envvar SYNERGY_* --preserve-envvar GIT_COMMIT -us -uc
mkdir -p package mkdir -p package
cd .. cd ..

1
ChangeLog
View file

@ -16,6 +16,7 @@ Bug fixes:
- #6944 Systray icon is incorrect for macOS Big Sur - #6944 Systray icon is incorrect for macOS Big Sur
- #6941 The application doesn't recognize old settings - #6941 The application doesn't recognize old settings
- #6945 Fix build for Raspberry Pi - #6945 Fix build for Raspberry Pi
- #6946 Add build stage to filename
Enhancements: Enhancements:
- #6912 Removes UI for Screen Saver Sync and Files Drag and Drop - #6912 Removes UI for Screen Saver Sync and Files Drag and Drop