Myth/zjunet
1
0
Fork 0
mirror of https://github.com/QSCTech/zjunet.git synced 2026-01-22 19:54:48 +08:00
Code Issues Projects Releases Wiki Activity

Fix CI bugs

Browse Source
This commit is contained in:
Wu Yufei 2020-11-12 21:52:33 +08:00
parent 2fa9b0a1e8
commit a9102a4b5b
No known key found for this signature in database
GPG Key ID: 226E1C0EDF292D66
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/packaging.yml vendored
View File

@ -28,6 +28,6 @@ jobs:
with: with:
name: Release Packages name: Release Packages
path: | path: |
build/debain/*.deb build/debian/zjunet_*.deb
build/rpm/*.rpm build/rpm/zjunet_*.rpm
build/openwrt/*.opk build/openwrt/zjunet_*.opk

4
build/changelog.py
View File

@ -8,7 +8,7 @@ import datetime
def get_time(s): def get_time(s):
if 'fromisoformat' in dir(datetime.datetime): if 'fromisoformat' in dir(datetime.datetime):
return datetime.datetime.fromisoformat(s) return datetime.datetime.fromisoformat(s.replace('Z', '+00:00'))
else: else:
return __import__('dateutil.parser').parser.parse(s) return __import__('dateutil.parser').parser.parse(s)
@ -54,7 +54,7 @@ def get_author(name):
return data return data
def get_changelog(owner, name): def get_changelog(owner, name):
print('Reading releases of {} in {}'.format(owner, name), flush=True, file=sys.stderr) print('Reading releases of {2} in {1}'.format(owner, name), flush=True, file=sys.stderr)
releases = api_get('repos/{}/{}/releases'.format(owner, name)) releases = api_get('repos/{}/{}/releases'.format(owner, name))
releases = filter(lambda v: not v['draft'] and not v['prerelease'], releases) releases = filter(lambda v: not v['draft'] and not v['prerelease'], releases)

4
build/rpm/build_spec.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
VERSION=$1 VERSION=$1
REALVERSION=`echo "$VERSION" | cut -d'-' -f1` REALVERSION=`echo "$VERSION" | cut -d'-' -f1`
@ -63,5 +63,5 @@ echo "" >> zjunet.spec
echo "%post" >> zjunet.spec echo "%post" >> zjunet.spec
echo "/usr/share/zjunet/zjunet-postinst || true" >> zjunet.spec echo "/usr/share/zjunet/zjunet-postinst || true" >> zjunet.spec
echo "" >> zjunet.spec echo "" >> zjunet.spec
../changelog.py rpm >> zjunet.spec
../../changelog.py rpm >> zjunet.spec