Skip to content

Commit aaba09c

Browse files
authored
Merge pull request #42 from dscho/mintty-has-an-epoch
/add relnote: respect MinTTY's "epoch"
2 parents 0a37279 + 3addc7c commit aaba09c

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

GitForWindowsHelper/component-updates.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ const pacmanRepositoryURLs = (package_name, version) =>
120120
]
121121

122122
const getMissingDeployments = async (package_name, version) => {
123+
// MinTTY is at epoch 1, which is part of Pacman's versioning scheme
124+
if (package_name === 'mintty') version = `1~${version}`
125+
123126
const urls = []
124127
const msysName = package_name.replace(/^mingw-w64-/, '')
125128
if (packageNeedsBothMSYSAndMINGW(msysName)) {

__tests__/component-updates.test.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,12 @@ http://www.gnutls.org/news.html#2023-02-10`
131131

132132
test('getMissingDeployments()', async () => {
133133
const missingURL = 'https://wingit.blob.core.windows.net/x86-64/curl-8.1.2-1-x86_64.pkg.tar.xz'
134-
const mockDoesURLReturn404 = jest.fn(url => url === missingURL)
134+
const missingMinTTYURL = 'https://wingit.blob.core.windows.net/i686/mintty-1~3.6.5-1-i686.pkg.tar.xz'
135+
const mockDoesURLReturn404 = jest.fn(url => url === missingURL || url === missingMinTTYURL)
135136
jest.mock('../GitForWindowsHelper/https-request', () => {
136137
return { doesURLReturn404: mockDoesURLReturn404 }
137138
})
138139

139140
expect(await getMissingDeployments('curl', '8.1.2')).toEqual([missingURL])
141+
expect(await getMissingDeployments('mintty', '3.6.5')).toEqual([missingMinTTYURL])
140142
})

0 commit comments

Comments
 (0)