ignore num-versions-to-delete when min-version-to-keep is set
This commit is contained in:
Vendored
+4
-2
@@ -34,8 +34,7 @@ function getVersionIds(input) {
|
|||||||
if (input.hasOldestVersionQueryInfo()) {
|
if (input.hasOldestVersionQueryInfo()) {
|
||||||
return version_1.getOldestVersions(input.owner, input.repo, input.packageName, input.numOldVersionsToDelete + input.minVersionsToKeep, input.token).pipe(operators_1.map(versionInfo => {
|
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;
|
const numberVersionsToDelete = versionInfo.length - input.minVersionsToKeep;
|
||||||
if (input.deletePreReleaseVersions == 'true' &&
|
if (input.minVersionsToKeep > 0) {
|
||||||
input.minVersionsToKeep > 0) {
|
|
||||||
return numberVersionsToDelete <= 0
|
return numberVersionsToDelete <= 0
|
||||||
? []
|
? []
|
||||||
: versionInfo
|
: versionInfo
|
||||||
@@ -101,6 +100,9 @@ class Input {
|
|||||||
this.ignoreVersions = validatedParams.ignoreVersions;
|
this.ignoreVersions = validatedParams.ignoreVersions;
|
||||||
this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions;
|
this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions;
|
||||||
this.token = validatedParams.token;
|
this.token = validatedParams.token;
|
||||||
|
if (this.minVersionsToKeep > 0) {
|
||||||
|
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep;
|
||||||
|
}
|
||||||
if (this.deletePreReleaseVersions == 'true') {
|
if (this.deletePreReleaseVersions == 'true') {
|
||||||
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep;
|
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep;
|
||||||
this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$');
|
this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$');
|
||||||
|
|||||||
+1
-4
@@ -20,10 +20,7 @@ export function getVersionIds(input: Input): Observable<string[]> {
|
|||||||
const numberVersionsToDelete =
|
const numberVersionsToDelete =
|
||||||
versionInfo.length - input.minVersionsToKeep
|
versionInfo.length - input.minVersionsToKeep
|
||||||
|
|
||||||
if (
|
if (input.minVersionsToKeep > 0) {
|
||||||
input.deletePreReleaseVersions == 'true' &&
|
|
||||||
input.minVersionsToKeep > 0
|
|
||||||
) {
|
|
||||||
return numberVersionsToDelete <= 0
|
return numberVersionsToDelete <= 0
|
||||||
? []
|
? []
|
||||||
: versionInfo
|
: versionInfo
|
||||||
|
|||||||
@@ -46,6 +46,10 @@ export class Input {
|
|||||||
this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions
|
this.deletePreReleaseVersions = validatedParams.deletePreReleaseVersions
|
||||||
this.token = validatedParams.token
|
this.token = validatedParams.token
|
||||||
|
|
||||||
|
if (this.minVersionsToKeep > 0) {
|
||||||
|
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
|
||||||
|
}
|
||||||
|
|
||||||
if (this.deletePreReleaseVersions == 'true') {
|
if (this.deletePreReleaseVersions == 'true') {
|
||||||
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
|
this.numOldVersionsToDelete = 100 - this.minVersionsToKeep
|
||||||
this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$')
|
this.ignoreVersions = new RegExp('^(0|[1-9]\\d*)((\\.(0|[1-9]\\d*))*)$')
|
||||||
|
|||||||
Reference in New Issue
Block a user