From 03b7f9f1bb5359370623d28782e31d822cc76c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Arnauts?= Date: Sat, 27 Feb 2021 13:36:13 +0100 Subject: [PATCH] Include modified files in the generated matrix zip --- addon_submitter/utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addon_submitter/utils.py b/addon_submitter/utils.py index 675e718..439fb68 100755 --- a/addon_submitter/utils.py +++ b/addon_submitter/utils.py @@ -58,11 +58,15 @@ def create_zip(zip_name, addon_id, subdirectory): """ logger.info('Creating ZIP file...') if subdirectory: - shell('git', 'archive', '-o', '{}.zip'.format(zip_name), 'HEAD', '--', - addon_id) + shell( + 'sh', '-c', + 'HASH=$(git stash create); git archive -o %s.zip ${HASH:-HEAD} -- %s' % (zip_name, addon_id) + ) else: - shell('git', 'archive', '-o', '{}.zip'.format(zip_name), - '--prefix', '{}/'.format(addon_id), 'HEAD') + shell( + 'sh', '-c', + 'HASH=$(git stash create); git archive -o %s.zip --prefix %s/ ${HASH:-HEAD}' % (zip_name, addon_id) + ) logger.info('ZIP created successfully.')