/deploy: no longer build the MSYS2 runtime packages for both architectures

The purpose of introducing a separate `msys2-runtime-3.3` package is to
allow supporting Git for Windows on i686 setups, even though it cannot
receive updates to the latest MSYS2 runtime versions any longer because
the MSYS2 project dropped i686 support a long time ago.

To that end, let's actually build `msys2-runtime-3.3` _only_ for i686,
and `msys2-runtime` _only_ for x86_64.

That split will allow us to change the `msys2-runtime-3.3` package
definition so that it supersedes ("replaces") `msys2-runtime` and
automagically updates the 32-bit Git for Windows SDKs out there.

This is a step toward phasing out i686 support of Git for Windows, see:
git-for-windows/git#4279 (comment) for
more details about that plan.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

GitForWindowsHelper/slash-commands.js

@@ -159,10 +159,17 @@ module.exports = async (context, req) => {
 
             const toTrigger = []
             if (isMSYSPackage(package_name)) {
-                toTrigger.push(
-                    { architecture: 'x86_64' },
-                    { architecture: 'i686' }
-                )
+                if (package_name !== 'msys2-runtime-3.3') {
+                    toTrigger.push(
+                        { architecture: 'x86_64' }
+                    )
+                }
+
+                if (package_name !== 'msys2-runtime') {
+                    toTrigger.push(
+                        { architecture: 'i686' }
+                    )
+                }
             } else {
                 toTrigger.push(
                     { displayArchitecture: 'i686/x86_64' }

__tests__/index.test.js

@@ -411,10 +411,10 @@ testIssueComment('/deploy msys2-runtime', {
     expect(await index(context, context.req)).toBeUndefined()
     expect(context.res.body).toEqual(`I edited the comment: appended-comment-body-existing comment body
 
-The [x86_64](dispatched-workflow-build-and-deploy.yml) and the [i686](dispatched-workflow-build-and-deploy.yml) workflow runs were started.`)
-    expect(mockQueueCheckRun).toHaveBeenCalledTimes(2)
-    expect(mockUpdateCheckRun).toHaveBeenCalledTimes(2)
-    expect(dispatchedWorkflows.map(e => e.payload.inputs.architecture)).toEqual(['i686', 'x86_64'])
+The workflow run [was started](dispatched-workflow-build-and-deploy.yml).`)
+    expect(mockQueueCheckRun).toHaveBeenCalledTimes(1)
+    expect(mockUpdateCheckRun).toHaveBeenCalledTimes(1)
+    expect(dispatchedWorkflows.map(e => e.payload.inputs.architecture)).toEqual(['x86_64'])
 })
 
 testIssueComment('/deploy msys2-runtime-3.3', {
@@ -433,10 +433,10 @@ testIssueComment('/deploy msys2-runtime-3.3', {
     expect(await index(context, context.req)).toBeUndefined()
     expect(context.res.body).toEqual(`I edited the comment: appended-comment-body-existing comment body
 
-The [x86_64](dispatched-workflow-build-and-deploy.yml) and the [i686](dispatched-workflow-build-and-deploy.yml) workflow runs were started.`)
-    expect(mockQueueCheckRun).toHaveBeenCalledTimes(2)
-    expect(mockUpdateCheckRun).toHaveBeenCalledTimes(2)
-    expect(dispatchedWorkflows.map(e => e.payload.inputs.architecture)).toEqual(['i686', 'x86_64'])
+The workflow run [was started](dispatched-workflow-build-and-deploy.yml).`)
+    expect(mockQueueCheckRun).toHaveBeenCalledTimes(1)
+    expect(mockUpdateCheckRun).toHaveBeenCalledTimes(1)
+    expect(dispatchedWorkflows.map(e => e.payload.inputs.architecture)).toEqual(['i686'])
 })
 
 testIssueComment('/add release note', {