From a9102a4b5baa04d731dc6869a40fdb96a3bc667b Mon Sep 17 00:00:00 2001
From: Wu Yufei <me@tespent.cn>
Date: Thu, 12 Nov 2020 21:52:33 +0800
Subject: [PATCH] Fix CI bugs

---
 .github/workflows/packaging.yml | 6 +++---
 build/changelog.py              | 4 ++--
 build/rpm/build_spec.sh         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 55351b3..583583a 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -28,6 +28,6 @@ jobs:
         with:
           name: Release Packages
           path: |
-            build/debain/*.deb
-            build/rpm/*.rpm
-            build/openwrt/*.opk
+            build/debian/zjunet_*.deb
+            build/rpm/zjunet_*.rpm
+            build/openwrt/zjunet_*.opk
diff --git a/build/changelog.py b/build/changelog.py
index d7764c3..dbec793 100755
--- a/build/changelog.py
+++ b/build/changelog.py
@@ -8,7 +8,7 @@ import datetime
 
 def get_time(s):
     if 'fromisoformat' in dir(datetime.datetime):
-        return datetime.datetime.fromisoformat(s)
+        return datetime.datetime.fromisoformat(s.replace('Z', '+00:00'))
     else:
         return __import__('dateutil.parser').parser.parse(s)
 
@@ -54,7 +54,7 @@ def get_author(name):
     return data
 
 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 = filter(lambda v: not v['draft'] and not v['prerelease'], releases)
 
diff --git a/build/rpm/build_spec.sh b/build/rpm/build_spec.sh
index 5bea7b2..7eb32b0 100755
--- a/build/rpm/build_spec.sh
+++ b/build/rpm/build_spec.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 VERSION=$1
 REALVERSION=`echo "$VERSION" | cut -d'-' -f1`
@@ -63,5 +63,5 @@ echo "" >> zjunet.spec
 echo "%post" >> zjunet.spec
 echo "/usr/share/zjunet/zjunet-postinst || true" >> zjunet.spec
 echo "" >> zjunet.spec
-../changelog.py rpm >> zjunet.spec
 
+../../changelog.py rpm >> zjunet.spec