remove clean up of channel signs, since we already use PR number (#93)

revert PR #91 there is a side effect when we clean dots in the track number, eg 2.0/stable becomes 20/stable
canonical · Mar 27, 2023 · e60e65a · e60e65a
1 parent 65ee829
commit e60e65a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 21 deletions.
diff --git a/dist/channel/index.js b/dist/channel/index.js
@@ -22854,14 +22854,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/dist/check-libraries/index.js b/dist/check-libraries/index.js
@@ -23047,14 +23047,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/dist/release-charm/index.js b/dist/release-charm/index.js
@@ -22946,14 +22946,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/dist/release-libraries/index.js b/dist/release-libraries/index.js
@@ -23077,14 +23077,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/dist/upload-bundle/index.js b/dist/upload-bundle/index.js
@@ -22925,14 +22925,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/dist/upload-charm/index.js b/dist/upload-charm/index.js
@@ -22953,14 +22953,12 @@ class Charmcraft {
             // however, we expect charmcraft pack to always output one charm file.
             const globber = yield glob.create('./*.charm');
             const paths = yield globber.glob();
-            // filter all characters which are not letters, numbers or hyphens
-            const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
             const args = [
                 'upload',
                 '--format',
                 'json',
                 '--release',
-                allowedChannel,
+                channel,
                 paths[0],
                 ...flags,
             ];

diff --git a/src/services/charmcraft/charmcraft.ts b/src/services/charmcraft/charmcraft.ts
@@ -193,14 +193,12 @@ class Charmcraft {
     const globber = await glob.create('./*.charm');
     const paths = await globber.glob();
 
-    // filter all characters which are not letters, numbers or hyphens
-    const allowedChannel = channel.replace(/[^a-zA-Z0-9\-/]/gi, '');
     const args = [
       'upload',
       '--format',
       'json',
       '--release',
-      allowedChannel,
+      channel,
       paths[0],
       ...flags,
     ];