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

Fix build issue with raspberry pi's (#7173)

Browse source 
* Minor change to deb-changelog

* Fix bash commands

* Update changelog

* Add comment explaining pass
This commit is contained in:
Kyle Bloom 2022-05-18 08:57:29 +01:00 committed by GitHub
parent 5b6f5df6ea
commit bb31d11deb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -62,7 +62,7 @@ jobs:
SYNERGY_VERSION_STAGE: ${{ steps.version.outputs.SYNERGY_VERSION_STAGE }} SYNERGY_VERSION_STAGE: ${{ steps.version.outputs.SYNERGY_VERSION_STAGE }}
run: | run: |
sed -i "s/ synergy/ ${PACKAGE_NAME}/g" ./debian/control sed -i "s/ synergy/ ${PACKAGE_NAME}/g" ./debian/control
python3 CI/deb_changelog.py "${PACKAGE_NAME}" "$(SYNERGY_DEB_VERSION)" python3 CI/deb_changelog.py "${PACKAGE_NAME}" "${SYNERGY_DEB_VERSION}"
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 ..

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

@ -95,7 +95,7 @@ steps:
displayName: "Setup variables" displayName: "Setup variables"
- script: | - script: |
python3 CI/deb_changelog.py synergy "$(SYNERGY_DEB_VERSION)" python3 CI/deb_changelog.py synergy "${SYNERGY_DEB_VERSION}"
export GPG_TTY=$(tty) 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 standard_package mkdir standard_package
@ -115,7 +115,7 @@ steps:
- script: | - script: |
export SYNERGY_ENTERPRISE=1 export SYNERGY_ENTERPRISE=1
python3 CI/deb_changelog.py synergy-enterprise "$(SYNERGY_DEB_VERSION)" python3 CI/deb_changelog.py synergy-enterprise "${SYNERGY_DEB_VERSION}"
export GPG_TTY=$(tty) 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 enterprise_package mkdir enterprise_package
@ -135,7 +135,7 @@ steps:
- script: | - script: |
export SYNERGY_BUSINESS=1 export SYNERGY_BUSINESS=1
python3 CI/deb_changelog.py synergy-business "$(SYNERGY_DEB_VERSION)" python3 CI/deb_changelog.py synergy-business "${SYNERGY_DEB_VERSION}"
export GPG_TTY=$(tty) 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 business_package mkdir business_package

5
CI/deb_changelog.py
View file

@ -12,7 +12,7 @@ if __name__ == '__main__':
parser.add_argument('-u', '--urgency', type=str, default='low', help='Urgency of the package') parser.add_argument('-u', '--urgency', type=str, default='low', help='Urgency of the package')
args = parser.parse_args() args = parser.parse_args()
build_time = datetime.now(timezone.utc).strftime('%a, %d %b %Y %H:%M:%S %z') # day-of-week, dd month yyyy hh:mm:ss +zzzz build_time = datetime.now(timezone.utc).strftime('%a, %d %b %Y %H:%M:%S %z') # day-of-week, dd month yyyy hh:mm:ss +zzzz
version_str = re.match('^(\d+.\d+.\d+).*$', args.version).group(1) version_str = re.match('^\d+\.\d+\.\d+', args.version).group(0)
with open('ChangeLog', 'r', encoding='utf8') as in_file, open('debian/changelog', 'w+', encoding='utf8') as out_file: with open('ChangeLog', 'r', encoding='utf8') as in_file, open('debian/changelog', 'w+', encoding='utf8') as out_file:
out_file.write('{} ({}) {}; urgency={}\n'.format(args.name, args.version, args.distribution, args.urgency)) out_file.write('{} ({}) {}; urgency={}\n'.format(args.name, args.version, args.distribution, args.urgency))
in_section = False in_section = False
@ -25,7 +25,8 @@ if __name__ == '__main__':
elif in_section: elif in_section:
break break
elif not in_section: elif not in_section:
continue # skip this line and read in the next
pass
elif line.strip().replace('=', '') == '': elif line.strip().replace('=', '') == '':
ignore_segment = False ignore_segment = False
elif line.strip() in IGNORE_SEGMENTS: elif line.strip() in IGNORE_SEGMENTS:

2
ChangeLog
View file

@ -16,7 +16,7 @@ Github Actions:
- #7156 Change binary storage server - #7156 Change binary storage server
- #7161 Use brew bundle to install dependencies - #7161 Use brew bundle to install dependencies
- #7162 Add new distributions to CI - #7162 Add new distributions to CI
- #7167 | #7168 Use changelog when creating deb files - #7167 | #7168 | #7173 Use changelog when creating deb files
- #7169 Remove temporary directory when building debs - #7169 Remove temporary directory when building debs
=========== ===========