Skip to content

fix(amazonq): bundle flare version comparison using numbers #7479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2025
Merged

fix(amazonq): bundle flare version comparison using numbers #7479

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5480b57
fix: bundle flare version comparison
leigaol Jun 12, 2025
e21fca5
use semver
leigaol Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion scripts/lspArtifact.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface ManifestVersion {
interface Manifest {
versions: ManifestVersion[]
}

async function verifyFileHash(filePath: string, expectedHash: string): Promise<boolean> {
return new Promise((resolve, reject) => {
const hash = crypto.createHash('sha384')
Expand All @@ -53,6 +54,21 @@ async function ensureDirectoryExists(dirPath: string): Promise<void> {
}
}

function compareVersions(v1: string, v2: string): number {
const parts1 = v1.split('.').map(Number)
const parts2 = v2.split('.').map(Number)

for (let i = 0; i < Math.max(parts1.length, parts2.length); i++) {
const part1 = parts1[i] || 0
const part2 = parts2[i] || 0

if (part1 > part2) return 1
if (part1 < part2) return -1
}

return 0
}

export async function downloadLanguageServer(): Promise<void> {
const tempDir = path.join(os.tmpdir(), 'amazonq-download-temp')
const resourcesDir = path.join(__dirname, '../packages/amazonq/resources/language-server')
Expand Down Expand Up @@ -86,7 +102,7 @@ export async function downloadLanguageServer(): Promise<void> {

const latestVersion = manifest.versions
.filter((v) => !v.isDelisted)
.sort((a, b) => b.serverVersion.localeCompare(a.serverVersion))[0]
.sort((a, b) => compareVersions(b.serverVersion, a.serverVersion))[0]

if (!latestVersion) {
throw new Error('No valid version found in manifest')
Expand Down
Loading