From bf9a79c703979fbc354286ee0f6635713deecd4d Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 26 Mar 2024 11:20:04 -0700 Subject: [PATCH 1/6] Remove conda install for aarch64 --- .github/scripts/validate_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh index 8dc7e52e6..8a31e2400 100755 --- a/.github/scripts/validate_binaries.sh +++ b/.github/scripts/validate_binaries.sh @@ -5,7 +5,7 @@ else if [[ ${TARGET_OS} == 'macos-arm64' ]]; then conda update -y -n base -c defaults conda - else + else if [[ ${TARGET_OS} != 'linux-aarch64' ]]; then # Conda pinned see issue: https://github.com/ContinuumIO/anaconda-issues/issues/13350 conda install -y conda=23.11.0 fi From 6add257f32bc2cc0618d7e827b857c36404ce609 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 26 Mar 2024 11:24:17 -0700 Subject: [PATCH 2/6] test --- .github/workflows/validate-release-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validate-release-binaries.yml b/.github/workflows/validate-release-binaries.yml index 1a8c51571..c320dd2bc 100644 --- a/.github/workflows/validate-release-binaries.yml +++ b/.github/workflows/validate-release-binaries.yml @@ -25,6 +25,7 @@ on: - .github/scripts/validate_binaries.sh - test/smoke_test/* + jobs: release: uses: ./.github/workflows/validate-binaries.yml From 230d8c5ec2a7a900e1ff23b9d65dfd43aef176f3 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 26 Mar 2024 11:32:09 -0700 Subject: [PATCH 3/6] Revert "test" This reverts commit 6add257f32bc2cc0618d7e827b857c36404ce609. --- .github/workflows/validate-release-binaries.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/validate-release-binaries.yml b/.github/workflows/validate-release-binaries.yml index c320dd2bc..1a8c51571 100644 --- a/.github/workflows/validate-release-binaries.yml +++ b/.github/workflows/validate-release-binaries.yml @@ -25,7 +25,6 @@ on: - .github/scripts/validate_binaries.sh - test/smoke_test/* - jobs: release: uses: ./.github/workflows/validate-binaries.yml From e02be38ed49722bd5544790da698f3a206d0dba8 Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 26 Mar 2024 11:32:48 -0700 Subject: [PATCH 4/6] fix_aarch64 --- .github/scripts/validate_binaries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh index 8a31e2400..7849a1d0a 100755 --- a/.github/scripts/validate_binaries.sh +++ b/.github/scripts/validate_binaries.sh @@ -5,7 +5,7 @@ else if [[ ${TARGET_OS} == 'macos-arm64' ]]; then conda update -y -n base -c defaults conda - else if [[ ${TARGET_OS} != 'linux-aarch64' ]]; then + elif [[ ${TARGET_OS} != 'linux-aarch64' ]]; then # Conda pinned see issue: https://github.com/ContinuumIO/anaconda-issues/issues/13350 conda install -y conda=23.11.0 fi From 48130574c3dc27320255b2ceb721600f3d47cc8d Mon Sep 17 00:00:00 2001 From: atalman Date: Tue, 26 Mar 2024 13:47:40 -0700 Subject: [PATCH 5/6] Increase timeout for aarch64 jobs --- .github/workflows/validate-aarch64-linux-binaries.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/validate-aarch64-linux-binaries.yml b/.github/workflows/validate-aarch64-linux-binaries.yml index a990f61c5..f5ecf98cf 100644 --- a/.github/workflows/validate-aarch64-linux-binaries.yml +++ b/.github/workflows/validate-aarch64-linux-binaries.yml @@ -114,6 +114,7 @@ jobs: docker-image: ${{ matrix.container_image }} binary-matrix: ${{ toJSON(matrix) }} no-sudo: true + timeout: 60 script: | set -ex export DESIRED_PYTHON=${{ matrix.python_version }} From f0595ac7a67f21ad59bf1fe91e1ceb1b529fa698 Mon Sep 17 00:00:00 2001 From: atalman Date: Wed, 27 Mar 2024 11:51:04 -0700 Subject: [PATCH 6/6] test --- .github/scripts/validate_binaries.sh | 8 ++++++-- .github/workflows/validate-aarch64-linux-binaries.yml | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/scripts/validate_binaries.sh b/.github/scripts/validate_binaries.sh index 7849a1d0a..8779e8064 100755 --- a/.github/scripts/validate_binaries.sh +++ b/.github/scripts/validate_binaries.sh @@ -69,6 +69,10 @@ else source ./.github/scripts/validate_test_ops.sh fi - conda deactivate - conda env remove -n ${ENV_NAME} + # TODO: remove if statement currently this step is timing out on linx-aarch64 + if [[ ${TARGET_OS} != 'linux-aarch64' ]]; then + conda deactivate + conda env remove -n ${ENV_NAME} + fi + fi diff --git a/.github/workflows/validate-aarch64-linux-binaries.yml b/.github/workflows/validate-aarch64-linux-binaries.yml index f5ecf98cf..a990f61c5 100644 --- a/.github/workflows/validate-aarch64-linux-binaries.yml +++ b/.github/workflows/validate-aarch64-linux-binaries.yml @@ -114,7 +114,6 @@ jobs: docker-image: ${{ matrix.container_image }} binary-matrix: ${{ toJSON(matrix) }} no-sudo: true - timeout: 60 script: | set -ex export DESIRED_PYTHON=${{ matrix.python_version }}