From 6fbeea7e3a847532bad76f2671be013256f9940c Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Thu, 2 May 2024 21:39:09 -0500 Subject: [PATCH 1/4] ci: reduce concurrency to 1 globally for conda The builds are failing for `aarch64`, and one log message hints that concurrent builds are messing with the same cache. Ref: https://github.com/apache/datafusion-python/issues/659 --- .github/workflows/conda.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index f8474565d..d48bbe550 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -16,7 +16,9 @@ on: # When this workflow is queued, automatically cancel any previous running # or pending jobs from the same branch concurrency: - group: conda-${{ github.head_ref }} + # temporarily making this a global lock to debug conda nightlies build + # group: conda-${{ github.head_ref }} + group: conda cancel-in-progress: true # Required shell entrypoint to have properly activated conda environments From 51d5ad004a1114bbf3838189bf3b89528662b669 Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 6 May 2024 14:52:54 -0500 Subject: [PATCH 2/4] ci: clean conda cache before building the packages The `actual` sha256 hashes match both what I calculate by downloading and running `sha256sum` and what is posted on conda-forge. I suspect then that our build is using some bad cached value as the "expected". conda-forge: https://conda.anaconda.org/conda-forge/noarch/ Ref: https://github.com/apache/datafusion-python/issues/659 --- .github/workflows/conda.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index d48bbe550..9b27e1f51 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -83,6 +83,9 @@ jobs: which python pip list mamba list + # Clean the conda cache + - name: Clean Conda Cache + run: conda clean --all --yes - name: Build conda packages run: | # suffix for nightly package versions From 53d6f123c4cdc7dd3d40aa7ba1f23eb2f1c07997 Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 6 May 2024 15:09:53 -0500 Subject: [PATCH 3/4] ci: remove cache cleaning step --- .github/workflows/conda.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 9b27e1f51..00965b6e2 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -84,8 +84,8 @@ jobs: pip list mamba list # Clean the conda cache - - name: Clean Conda Cache - run: conda clean --all --yes + # - name: Clean Conda Cache + # run: conda clean --all --yes - name: Build conda packages run: | # suffix for nightly package versions From dd6f648925b366c4203d6f95c893d608391d3d07 Mon Sep 17 00:00:00 2001 From: Michael-J-Ward Date: Mon, 6 May 2024 15:15:18 -0500 Subject: [PATCH 4/4] ci: revert back to original conda.yml Cleaning out the cache caused all the conda builds to break, instead of just the `aarch64` ones. This commit reverts back to original CI def. --- .github/workflows/conda.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml index 00965b6e2..f8474565d 100644 --- a/.github/workflows/conda.yml +++ b/.github/workflows/conda.yml @@ -16,9 +16,7 @@ on: # When this workflow is queued, automatically cancel any previous running # or pending jobs from the same branch concurrency: - # temporarily making this a global lock to debug conda nightlies build - # group: conda-${{ github.head_ref }} - group: conda + group: conda-${{ github.head_ref }} cancel-in-progress: true # Required shell entrypoint to have properly activated conda environments @@ -83,9 +81,6 @@ jobs: which python pip list mamba list - # Clean the conda cache - # - name: Clean Conda Cache - # run: conda clean --all --yes - name: Build conda packages run: | # suffix for nightly package versions