From f5d25e8d486c237bc3e2719e26fccf95d10747c1 Mon Sep 17 00:00:00 2001
From: Etienne Trimaille <gustrimaille@yahoo.fr>
Date: Wed, 5 Aug 2020 10:19:21 +0200
Subject: [PATCH 1/2] Use underscore instead of hyphen for plugin name

---
 qgispluginci/parameters.py | 6 +++---
 test/plugins.xml.expected  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qgispluginci/parameters.py b/qgispluginci/parameters.py
index 505c9f8f..954f53cc 100644
--- a/qgispluginci/parameters.py
+++ b/qgispluginci/parameters.py
@@ -13,7 +13,7 @@ class Parameters:
     ----------
     plugin_path: str
         The directory of the source code in the repository.
-        Defaults to: `slugify(plugin_name, separator='_')`
+        Defaults to: `slugify(plugin_name)`
 
     github_organization_slug: str
         The organization slug on SCM host (e.g. Github) and translation platform (e.g. Transifex).
@@ -117,9 +117,9 @@ def archive_name(self, release_version: str, experimental: bool = False) -> str:
         Returns the archive file name
         """
         # zipname: use dot before version number
-        # and not dash since it's causing issues
+        # and not dash since it's causing issues #22
         return '{zipname}{experimental}.{release_version}.zip'.format(
-            zipname=self.plugin_slug,
+            zipname=self.plugin_slug.replace('-', '_'),
             experimental='-experimental' if experimental else '',
             release_version=release_version
         )
diff --git a/test/plugins.xml.expected b/test/plugins.xml.expected
index 4dfa9d86..d3ece6eb 100644
--- a/test/plugins.xml.expected
+++ b/test/plugins.xml.expected
@@ -5,10 +5,10 @@
         <version>0.1.2</version>
         <qgis_minimum_version>3.2</qgis_minimum_version>
         <homepage>https://github.com/opengisch/qgis-plugin-ci</homepage>
-        <file_name>qgis-plugin-ci-testing.0.1.2.zip</file_name>
+        <file_name>qgis_plugin_ci-testing.0.1.2.zip</file_name>
         <icon>icons/opengisch.png</icon>
         <author_name>Denis Rouzaud</author_name>
-        <download_url>https://github.com/opengisch/qgis-plugin-ci/releases/download/0.1.2/qgis-plugin-ci-testing.0.1.2.zip</download_url>
+        <download_url>https://github.com/opengisch/qgis-plugin-ci/releases/download/0.1.2/qgis_plugin_ci-testing.0.1.2.zip</download_url>
         <uploaded_by>Denis Rouzaud</uploaded_by>
         <create_date>1985-07-21</create_date>
         <update_date>__TODAY__</update_date>

From fb7a9299c5e8788764c77cfce34d0d25dc8e81a2 Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Wed, 5 Aug 2020 10:47:03 +0200
Subject: [PATCH 2/2] Update plugins.xml.expected

---
 test/plugins.xml.expected | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/plugins.xml.expected b/test/plugins.xml.expected
index d3ece6eb..9508d0ee 100644
--- a/test/plugins.xml.expected
+++ b/test/plugins.xml.expected
@@ -5,10 +5,10 @@
         <version>0.1.2</version>
         <qgis_minimum_version>3.2</qgis_minimum_version>
         <homepage>https://github.com/opengisch/qgis-plugin-ci</homepage>
-        <file_name>qgis_plugin_ci-testing.0.1.2.zip</file_name>
+        <file_name>qgis_plugin_ci_testing.0.1.2.zip</file_name>
         <icon>icons/opengisch.png</icon>
         <author_name>Denis Rouzaud</author_name>
-        <download_url>https://github.com/opengisch/qgis-plugin-ci/releases/download/0.1.2/qgis_plugin_ci-testing.0.1.2.zip</download_url>
+        <download_url>https://github.com/opengisch/qgis-plugin-ci/releases/download/0.1.2/qgis_plugin_ci_testing.0.1.2.zip</download_url>
         <uploaded_by>Denis Rouzaud</uploaded_by>
         <create_date>1985-07-21</create_date>
         <update_date>__TODAY__</update_date>