From 3da409f70779ef25294771bea245378533b682d4 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 07:41:07 -0500 Subject: [PATCH 01/10] BLD: Fix uploading of aarch64 wheels --- .circleci/config.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5f25c891acf8a..a630f3aa6c58d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,8 +26,8 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.large environment: - TAG = << pipeline.git.tag >> - TRIGGER_SOURCE = << pipeline.trigger_source >> + TAG: << pipeline.git.tag >> + TRIGGER_SOURCE: << pipeline.trigger_source >> steps: - checkout - run: @@ -35,9 +35,11 @@ jobs: command: | # Check if tag is defined or TRIGGER_SOURCE is scheduled if [[ -n ${TAG} ]]; then - export IS_PUSH="true" - elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then - export IS_SCHEDULE_DISPATCH="true" + echo 'export IS_PUSH="true" >> "$BASH_ENV"' + # TODO: Revert, just testing this + #elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then + elif [[ $TRIGGER_SOURCE == "api" ]]; then + echo 'export IS_SCHEDULE_DISPATCH="true" >> "$BASH_ENV"' # Look for the build label/[wheel build] in commit # grep takes a regex, so need to escape brackets elif (git log --format=oneline -n 1 $CIRCLE_SHA1) | grep -q '\[wheel build\]'; then @@ -52,15 +54,13 @@ jobs: cibuildwheel --output-dir wheelhouse environment: CIBW_BUILD: << parameters.cibw-build >> + + - run: .circleci/setup_env.sh - run: - name: Upload wheels + name: Install Anaconda Client & Upload Wheels command: | - if [[ -n ${TAG} ]]; then - export IS_PUSH="true" - fi - if [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then - export IS_SCHEDULE_DISPATCH="true" - fi + PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH + conda install -q -y anaconda-client source ci/upload_wheels.sh set_upload_vars upload_wheels From 383902fcd0efc8993ac6e14f9278ff64b56d5292 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 08:38:42 -0500 Subject: [PATCH 02/10] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index a630f3aa6c58d..fe8c5ca455831 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ jobs: image: ubuntu-2004:202101-01 resource_class: arm.large environment: + ENV_FILE: ci/deps/circle-38-arm64.yaml TAG: << pipeline.git.tag >> TRIGGER_SOURCE: << pipeline.trigger_source >> steps: From 012d782bb913aa535ac42e53807c0bf900f8a129 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:05:07 -0500 Subject: [PATCH 03/10] Update config.yml --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fe8c5ca455831..f41152f5cbe72 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,7 @@ jobs: # TODO: Revert, just testing this #elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then elif [[ $TRIGGER_SOURCE == "api" ]]; then + echo "Trigger source works" echo 'export IS_SCHEDULE_DISPATCH="true" >> "$BASH_ENV"' # Look for the build label/[wheel build] in commit # grep takes a regex, so need to escape brackets From d56f7567e16d3b6db76bd048fe8febe87b3ede0d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:14:25 -0500 Subject: [PATCH 04/10] Update config.yml --- .circleci/config.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f41152f5cbe72..33575f5003912 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,6 @@ jobs: resource_class: arm.large environment: ENV_FILE: ci/deps/circle-38-arm64.yaml - TAG: << pipeline.git.tag >> TRIGGER_SOURCE: << pipeline.trigger_source >> steps: - checkout @@ -35,13 +34,13 @@ jobs: name: Check if build is necessary command: | # Check if tag is defined or TRIGGER_SOURCE is scheduled - if [[ -n ${TAG} ]]; then - echo 'export IS_PUSH="true" >> "$BASH_ENV"' + if [[ -n "$CIRCLE_TAG" ]]; then + echo 'export IS_PUSH="true"' >> "$BASH_ENV" # TODO: Revert, just testing this #elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then elif [[ $TRIGGER_SOURCE == "api" ]]; then echo "Trigger source works" - echo 'export IS_SCHEDULE_DISPATCH="true" >> "$BASH_ENV"' + echo 'export IS_SCHEDULE_DISPATCH="true"' >> "$BASH_ENV" # Look for the build label/[wheel build] in commit # grep takes a regex, so need to escape brackets elif (git log --format=oneline -n 1 $CIRCLE_SHA1) | grep -q '\[wheel build\]'; then From 7ced16f278d186ce03d468724b9d51712ceeccf9 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:18:21 -0500 Subject: [PATCH 05/10] Update config.yml --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 33575f5003912..618c5355ec8ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -38,7 +38,7 @@ jobs: echo 'export IS_PUSH="true"' >> "$BASH_ENV" # TODO: Revert, just testing this #elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then - elif [[ $TRIGGER_SOURCE == "api" ]]; then + elif [[ $TRIGGER_SOURCE == "webhook" ]]; then echo "Trigger source works" echo 'export IS_SCHEDULE_DISPATCH="true"' >> "$BASH_ENV" # Look for the build label/[wheel build] in commit From 5d439d92b8cacbd3b3babe7521a754c38f933795 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 12:20:43 -0500 Subject: [PATCH 06/10] Update config.yml --- .circleci/config.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 618c5355ec8ca..f167a92ed1b38 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -36,10 +36,7 @@ jobs: # Check if tag is defined or TRIGGER_SOURCE is scheduled if [[ -n "$CIRCLE_TAG" ]]; then echo 'export IS_PUSH="true"' >> "$BASH_ENV" - # TODO: Revert, just testing this - #elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then - elif [[ $TRIGGER_SOURCE == "webhook" ]]; then - echo "Trigger source works" + elif [[ $TRIGGER_SOURCE == "scheduled_pipeline" ]]; then echo 'export IS_SCHEDULE_DISPATCH="true"' >> "$BASH_ENV" # Look for the build label/[wheel build] in commit # grep takes a regex, so need to escape brackets @@ -60,8 +57,19 @@ jobs: - run: name: Install Anaconda Client & Upload Wheels command: | - PATH=$HOME/miniconda3/envs/pandas-dev/bin:$HOME/miniconda3/condabin:$PATH - conda install -q -y anaconda-client + echo "Install Mambaforge" + MAMBA_URL="https://github.com/conda-forge/miniforge/releases/download/4.14.0-0/Mambaforge-4.14.0-0-Linux-aarch64.sh" + echo "Downloading $MAMBA_URL" + wget -q $MAMBA_URL -O minimamba.sh + chmod +x minimamba.sh + + MAMBA_DIR="$HOME/miniconda3" + rm -rf $MAMBA_DIR + ./minimamba.sh -b -p $MAMBA_DIR + + export PATH=$MAMBA_DIR/bin:$PATH + + mamba install -y -c conda-forge anaconda-client source ci/upload_wheels.sh set_upload_vars upload_wheels From 0dc7a78b6e4af2c899c148b0ca511ae230a56689 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:09:42 -0500 Subject: [PATCH 07/10] fix style --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f167a92ed1b38..f0b3978387658 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -52,7 +52,7 @@ jobs: cibuildwheel --output-dir wheelhouse environment: CIBW_BUILD: << parameters.cibw-build >> - + - run: .circleci/setup_env.sh - run: name: Install Anaconda Client & Upload Wheels @@ -68,7 +68,7 @@ jobs: ./minimamba.sh -b -p $MAMBA_DIR export PATH=$MAMBA_DIR/bin:$PATH - + mamba install -y -c conda-forge anaconda-client source ci/upload_wheels.sh set_upload_vars From 364c6ecc89ed31deb34c54018080fad57aa35d01 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:52:31 -0500 Subject: [PATCH 08/10] Update config.yml --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f0b3978387658..829aaa251d7e0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -53,7 +53,6 @@ jobs: environment: CIBW_BUILD: << parameters.cibw-build >> - - run: .circleci/setup_env.sh - run: name: Install Anaconda Client & Upload Wheels command: | @@ -70,6 +69,9 @@ jobs: export PATH=$MAMBA_DIR/bin:$PATH mamba install -y -c conda-forge anaconda-client + + anaconda -q -t ${TOKEN} upload --skip -u ${ANACONDA_ORG} ./wheelhouse/*.whl + source ci/upload_wheels.sh set_upload_vars upload_wheels From d5798f8d5e1be4818b535a1e523b138e21520f3d Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 13 Feb 2023 22:07:28 -0500 Subject: [PATCH 09/10] Update config.yml --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 829aaa251d7e0..a81388777ffd2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,8 +70,6 @@ jobs: mamba install -y -c conda-forge anaconda-client - anaconda -q -t ${TOKEN} upload --skip -u ${ANACONDA_ORG} ./wheelhouse/*.whl - source ci/upload_wheels.sh set_upload_vars upload_wheels From 843245798aacd404c8307adeaa1a1310c9c92809 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 14 Feb 2023 07:02:10 -0500 Subject: [PATCH 10/10] style --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a81388777ffd2..ac28728685ce4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -69,7 +69,7 @@ jobs: export PATH=$MAMBA_DIR/bin:$PATH mamba install -y -c conda-forge anaconda-client - + source ci/upload_wheels.sh set_upload_vars upload_wheels