From 9854107d3e16d5a2ca2e41d29af4261360251292 Mon Sep 17 00:00:00 2001
From: Vladimir Safonkin <vsafonkin@github.com>
Date: Mon, 17 Oct 2022 12:48:42 +0200
Subject: [PATCH] Check platform firstly

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

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 3bc2f320..f153c3c2 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -66614,8 +66614,8 @@ function pypyVersionToSemantic(versionSpec) {
 }
 exports.pypyVersionToSemantic = pypyVersionToSemantic;
 function isArchPresentForWindows(item, architecture) {
-    architecture = ReplaceX32toX86(architecture);
-    return item.files.some((file) => file.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(file.platform));
+    architecture = replaceX32toX86(architecture);
+    return item.files.some((file) => utils_1.WINDOWS_PLATFORMS.includes(file.platform) && file.arch === architecture);
 }
 exports.isArchPresentForWindows = isArchPresentForWindows;
 function isArchPresentForMacOrLinux(item, architecture, platform) {
@@ -66623,15 +66623,15 @@ function isArchPresentForMacOrLinux(item, architecture, platform) {
 }
 exports.isArchPresentForMacOrLinux = isArchPresentForMacOrLinux;
 function findAssetForWindows(releases, architecture) {
-    architecture = ReplaceX32toX86(architecture);
-    return releases.files.find((item) => item.arch === architecture && utils_1.WINDOWS_PLATFORMS.includes(item.platform));
+    architecture = replaceX32toX86(architecture);
+    return releases.files.find((item) => utils_1.WINDOWS_PLATFORMS.includes(item.platform) && item.arch === architecture);
 }
 exports.findAssetForWindows = findAssetForWindows;
 function findAssetForMacOrLinux(releases, architecture, platform) {
     return releases.files.find((item) => item.arch === architecture && item.platform === platform);
 }
 exports.findAssetForMacOrLinux = findAssetForMacOrLinux;
-function ReplaceX32toX86(architecture) {
+function replaceX32toX86(architecture) {
     // convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value.
     if (architecture === 'x32') {
         architecture = 'x86';
diff --git a/src/install-pypy.ts b/src/install-pypy.ts
index 1ab48ab4..d8594ba6 100644
--- a/src/install-pypy.ts
+++ b/src/install-pypy.ts
@@ -205,10 +205,10 @@ export function pypyVersionToSemantic(versionSpec: string) {
 }
 
 export function isArchPresentForWindows(item: any, architecture: string) {
-  architecture = ReplaceX32toX86(architecture);
+  architecture = replaceX32toX86(architecture);
   return item.files.some(
     (file: any) =>
-      file.arch === architecture && WINDOWS_PLATFORMS.includes(file.platform)
+      WINDOWS_PLATFORMS.includes(file.platform) && file.arch === architecture
   );
 }
 
@@ -223,10 +223,10 @@ export function isArchPresentForMacOrLinux(
 }
 
 export function findAssetForWindows(releases: any, architecture: string) {
-  architecture = ReplaceX32toX86(architecture);
+  architecture = replaceX32toX86(architecture);
   return releases.files.find(
     (item: any) =>
-      item.arch === architecture && WINDOWS_PLATFORMS.includes(item.platform)
+      WINDOWS_PLATFORMS.includes(item.platform) && item.arch === architecture
   );
 }
 
@@ -240,7 +240,7 @@ export function findAssetForMacOrLinux(
   );
 }
 
-function ReplaceX32toX86(architecture: string): string {
+function replaceX32toX86(architecture: string): string {
   // convert x32 to x86 because os.arch() returns x32 for 32-bit systems but PyPy releases json has x86 arch value.
   if (architecture === 'x32') {
     architecture = 'x86';