ignore num-versions-to-delete when min-version-to-keep is set

actions · Nov 17, 2021 · 32b30cf · 32b30cf
1 parent b5e80e7
commit 32b30cf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -34,8 +34,7 @@ function getVersionIds(input) {
     if (input.hasOldestVersionQueryInfo()) {
         return version_1.getOldestVersions(input.owner, input.repo, input.packageName, input.numOldVersionsToDelete + input.minVersionsToKeep, input.token).pipe(operators_1.map(versionInfo => {
             const numberVersionsToDelete = versionInfo.length - input.minVersionsToKeep;
-            if (input.deletePreReleaseVersions == 'true' &&
-                input.minVersionsToKeep > 0) {
+            if (input.minVersionsToKeep > 0) {
                 return numberVersionsToDelete <= 0
                     ? []
                     : versionInfo
@@ -101,6 +100,9 @@ class Input {
         this.ignoreVersions = validatedParams.ignoreVersions;
         this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions;
         this.token = validatedParams.token;
+        if (this.minVersionsToKeep > 0) {
+            this.numOldVersionsToDelete = 100 - this.minVersionsToKeep;
+        }
         if (this.deletePreReleaseVersions == 'true') {
             this.numOldVersionsToDelete = 100 - this.minVersionsToKeep;
             this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$');

diff --git a/src/delete.ts b/src/delete.ts
@@ -20,10 +20,7 @@ export function getVersionIds(input: Input): Observable<string[]> {
         const numberVersionsToDelete =
           versionInfo.length - input.minVersionsToKeep
 
-        if (
-          input.deletePreReleaseVersions == 'true' &&
-          input.minVersionsToKeep > 0
-        ) {
+        if (input.minVersionsToKeep > 0) {
           return numberVersionsToDelete <= 0
             ? []
             : versionInfo

diff --git a/src/input.ts b/src/input.ts
@@ -46,6 +46,10 @@ export class Input {
     this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions
     this.token = validatedParams.token
 
+    if (this.minVersionsToKeep > 0) {
+      this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
+    }
+
     if (this.deletePreReleaseVersions == 'true') {
       this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
       this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$')