From ef8bceaea257fa0d26abb35148521a5113f29ed8 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Tue, 7 May 2024 13:21:55 -0700
Subject: [PATCH 1/2] Don't deactivate/remove conda on linux

---
 .github/scripts/validate_binaries.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh
index 8779e8064..c28dc2dd5 100755
--- a/.github/scripts/validate_binaries.sh
+++ b/.github/scripts/validate_binaries.sh
@@ -69,8 +69,8 @@ else
         source ./.github/scripts/validate_test_ops.sh
     fi
 
-    # TODO: remove if statement currently this step is timing out on linx-aarch64
-    if [[ ${TARGET_OS} != 'linux-aarch64' ]]; then
+    # this is optional step
+    if [[ ${TARGET_OS} != linux*  ]]; then
         conda deactivate
         conda env remove -n ${ENV_NAME}
     fi

From f54b7804d97976297f22f64803a1e27d6924a925 Mon Sep 17 00:00:00 2001
From: atalman <atalman@fb.com>
Date: Tue, 7 May 2024 13:23:02 -0700
Subject: [PATCH 2/2] test

---
 .github/scripts/validate_binaries.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh
index c28dc2dd5..bf5c15690 100755
--- a/.github/scripts/validate_binaries.sh
+++ b/.github/scripts/validate_binaries.sh
@@ -54,6 +54,11 @@ else
         ${PWD}/check_binary.sh
     fi
 
+     # We are only interested in CUDA tests and Python 3.8-3.11. Not all requirement libraries are available for 3.12 yet.
+    if [[ ${INCLUDE_TEST_OPS:-} == 'true' &&  ${MATRIX_GPU_ARCH_TYPE} == 'cuda' && ${MATRIX_PYTHON_VERSION} != "3.12" ]]; then
+        source ./.github/scripts/validate_test_ops.sh
+    fi
+
     if [[ ${TARGET_OS} == 'windows' ]]; then
         python  ./test/smoke_test/smoke_test.py ${TEST_SUFFIX}
     else
@@ -64,11 +69,6 @@ else
         export PATH=${OLD_PATH}
     fi
 
-    # We are only interested in CUDA tests and Python 3.8-3.11. Not all requirement libraries are available for 3.12 yet.
-    if [[ ${INCLUDE_TEST_OPS:-} == 'true' &&  ${MATRIX_GPU_ARCH_TYPE} == 'cuda' && ${MATRIX_PYTHON_VERSION} != "3.12" ]]; then
-        source ./.github/scripts/validate_test_ops.sh
-    fi
-
     # this is optional step
     if [[ ${TARGET_OS} != linux*  ]]; then
         conda deactivate