From ffca1d453bccc4bc0f58daa1e925d50619a46597 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@github.com>
Date: Thu, 13 Oct 2022 17:54:26 +0200
Subject: [PATCH] Debug

---
 dist/setup/index.js | 19 +++++++------------
 src/install-pypy.ts | 20 +++++++-------------
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 542233ca..45fe94b7 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -66541,7 +66541,7 @@ function findRelease(releases, pythonVersion, pypyVersion, architecture) {
     });
     const foundRelease = sortedReleases[0];
     const foundAsset = utils_1.IS_WINDOWS
-        ? findAssetForWindows(foundRelease)
+        ? findAssetForWindows(foundRelease, architecture)
         : findAssetForMacOrLinux(foundRelease, architecture, process.platform);
     return {
         foundAsset,
@@ -66569,24 +66569,19 @@ function isArchPresentForWindows(item, architecture) {
     if (architecture === 'x32') {
         architecture = 'x86';
     }
-    core.info(`DEBUG: pypy: ${item.pypy_version}, python: ${item.python_version}, architecture: ${architecture}`);
-    const result = item.files.some((file) => {
-        core.info(`arch: ${file.arch}`);
-        const res = file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
-        core.info(`res: ${res}`);
-        return res;
+    return item.files.some((file) => {
+        return file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform);
     });
-    core.info(`result: ${result}`);
-    return result;
 }
 exports.isArchPresentForWindows = isArchPresentForWindows;
 function isArchPresentForMacOrLinux(item, architecture, platform) {
     return item.files.some((file) => file.arch === architecture && file.platform === platform);
 }
 exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
-function findAssetForWindows(releases) {
-    return releases.files.find((item) => utils_1.WINDOWS_ARCHS.includes(item.arch) &&
-        utils_1.WINDOWS_PLATFORMS.includes(item.platform));
+function findAssetForWindows(releases, architecture) {
+    return releases.files.find((item) => {
+        return item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform);
+    });
 }
 exports.findAssetForWindows = findAssetForWindows;
 function findAssetForMacOrLinux(releases, architecture, platform) {
diff --git a/src/install-pypy.ts b/src/install-pypy.ts
index 07734140..a830f65c 100644
--- a/src/install-pypy.ts
+++ b/src/install-pypy.ts
@@ -181,7 +181,7 @@ export function findRelease(
 
   const foundRelease = sortedReleases[0];
   const foundAsset = IS_WINDOWS
-    ? findAssetForWindows(foundRelease)
+    ? findAssetForWindows(foundRelease, architecture)
     : findAssetForMacOrLinux(foundRelease, architecture, process.platform);
 
   return {
@@ -210,17 +210,11 @@ export function isArchPresentForWindows(item: any, architecture: string) {
   if (architecture === 'x32') {
     architecture = 'x86';
   }
-  core.info(`DEBUG: pypy: ${item.pypy_version}, python: ${item.python_version}, architecture: ${architecture}`)
-  const result = item.files.some(
+  return item.files.some(
     (file: any) => {
-      core.info(`arch: ${file.arch}`);
-      const res = file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
-      core.info(`res: ${res}`);
-      return res;
+      return file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform);
     }
   );
-  core.info(`result: ${result}`)
-  return result
 }
 
 export function isArchPresentForMacOrLinux(
@@ -233,11 +227,11 @@ export function isArchPresentForMacOrLinux(
   );
 }
 
-export function findAssetForWindows(releases: any) {
+export function findAssetForWindows(releases: any, architecture: string) {
   return releases.files.find(
-    (item: any) =>
-      WINDOWS_ARCHS.includes(item.arch) &&
-      WINDOWS_PLATFORMS.includes(item.platform)
+    (item: any) => {
+      return item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform);
+    }    
   );
 }