Skip to content

Commit 7058de5

Browse files
authored
Merge pull request #173 from git-for-windows/stop-deploying-i686-pcre2
Stop deploying the i686/MSYS `pcre2` package
2 parents eb79833 + 76c3cb6 commit 7058de5

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

GitForWindowsHelper/component-updates.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,13 @@ const getMissingDeployments = async (package_name, version) => {
168168
const urls = []
169169
const msysName = package_name.replace(/^mingw-w64-/, '')
170170
if (packageNeedsBothMSYSAndMINGW(msysName)) {
171-
urls.push(...pacmanRepositoryURLs(msysName, version, architectures))
171+
urls.push(...pacmanRepositoryURLs(
172+
msysName,
173+
version,
174+
package_name === 'pcre2'
175+
? architectures.filter(e => e !== 'i686')
176+
: architectures
177+
))
172178
urls.push(...pacmanRepositoryURLs(`mingw-w64-${msysName}`, version, mingwArchitectures))
173179
} else if (package_name !== msysName) {
174180
urls.push(...pacmanRepositoryURLs(package_name, version, mingwArchitectures))

GitForWindowsHelper/slash-commands.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ module.exports = async (context, req) => {
200200
)
201201
}
202202

203-
if (package_name !== 'msys2-runtime') {
203+
if (package_name !== 'msys2-runtime' && package_name !== 'pcre2') {
204204
toTrigger.push(
205205
{ architecture: 'i686' }
206206
)

0 commit comments

Comments
 (0)