From 8fb6a457db37066642bd9f4f53d23e2dccb82d01 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 3 May 2024 15:02:07 +0200
Subject: [PATCH] fix(versioning/swift): support dependencies with v prefix
tags (#28822)
---
lib/modules/versioning/swift/index.spec.ts | 3 +++
lib/modules/versioning/swift/index.ts | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/modules/versioning/swift/index.spec.ts b/lib/modules/versioning/swift/index.spec.ts
index b1282c6a55..9052516ec5 100644
--- a/lib/modules/versioning/swift/index.spec.ts
+++ b/lib/modules/versioning/swift/index.spec.ts
@@ -15,6 +15,8 @@ describe('modules/versioning/swift/index', () => {
version | expected
${'from: "1.2.3"'} | ${false}
${'1.2.3'} | ${true}
+ ${'v1.2.3'} | ${true}
+ ${'a'} | ${false}
`('isVersion("$version") === $expected', ({ version, expected }) => {
expect(!!isVersion(version)).toBe(expected);
});
@@ -99,6 +101,7 @@ describe('modules/versioning/swift/index', () => {
it.each`
version | range | expected
${'1.2.3'} | ${'1.2.3'} | ${true}
+ ${'v1.2.3'} | ${'1.2.3'} | ${true}
${'1.2.4'} | ${'..."1.2.4"'} | ${true}
${'v1.2.4'} | ${'..."1.2.4"'} | ${true}
${'1.2.4'} | ${'..."1.2.3"'} | ${false}
diff --git a/lib/modules/versioning/swift/index.ts b/lib/modules/versioning/swift/index.ts
index a67d5699cc..93510c78ea 100644
--- a/lib/modules/versioning/swift/index.ts
+++ b/lib/modules/versioning/swift/index.ts
@@ -63,7 +63,7 @@ function isLessThanRange(version: string, range: string): boolean {
function matches(version: string, range: string): boolean {
// Check if both are an exact version
- if (valid(range) && version === range) {
+ if (isVersion(range) && equals(version, range)) {
return true;
}
const semverRange = toSemverRange(range);
--
GitLab