Fix: upstream tarball generation for CI

1 files changed, 8 insertions, 8 deletions

diff --git a/ick_helpers.py b/ick_helpers.py
index eca9cd7..90e00d0 100644
--- a/ick_helpers.py
+++ b/ick_helpers.py
@@ -114,8 +114,8 @@ class Exec:
             if self.is_release_tag(tag, project)
         ]
 
-    def create_tarball_from_tag(self, tag, filename):
-        self.run('git', 'archive', '-o', 'temp.tar', tag)
+    def create_tarball_from_tag(self, ref, filename):
+        self.run('git', 'archive', '-o', 'temp.tar', ref)
         self.run('xz', '-9', 'temp.tar')
         self.run('mv', 'temp.tar.xz', filename)
 
@@ -157,10 +157,9 @@ class DebianBuilderBase:
         self.debfullname = debfullname
         self.debemail = debemail
 
-    def create_upstream_tarball(self, tag):
-        basename = '{}.tar.xz'.format(tag)
+    def create_upstream_tarball(self, basename, ref):
         tarball = os.path.abspath(basename)
-        self.ex.create_tarball_from_tag(tag, tarball)
+        self.ex.create_tarball_from_tag(ref, tarball)
         return basename
 
     def create_debian_orig_tarball(self, upstream_tarball, source, version):
@@ -215,7 +214,8 @@ class DebianReleaseBuilder(DebianBuilderBase):
     def build(self, tag, distribution):
         self.checkout(tag)
 
-        upstream_tarball = self.create_upstream_tarball(tag)
+        basename = '{}.tar.xz'.format(tag)
+        upstream_tarball = self.create_upstream_tarball(basename, tag)
         self.stash(upstream_tarball)
 
         source = self.get_source_package()
@@ -268,12 +268,12 @@ class DebianCIBuilder(DebianBuilderBase):
         self.debemail = debemail
 
     def build(self, distribution):
-        upstream_tarball = self.create_upstream_tarball(tag)
-
         source = self.get_source_package()
         version = self.get_version()
         curdist = self.get_distribution()
 
+        basename = '{}-{}.tar.xz'.format(source, version.upstream)
+        upstream_tarball = self.create_upstream_tarball(basename, 'HEAD')
         orig_tarball = self.create_debian_orig_tarball(
             upstream_tarball, source, version)