From f7ee933c7b763c82f7f470ceb2289a576454725c Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:33:25 -0700 Subject: [PATCH 1/3] Revert "Pip install anaconda" This reverts commit 2c453fb614a48459c1ceac71def2f6f58e42064c. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f8bbd100e..e96ec63ea 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -236,6 +236,6 @@ jobs: ANACONDA_API_TOKEN: ${{ secrets.DASK_CONDA_TOKEN }} run: | # install anaconda for upload - pip install anaconda + mamba install anaconda anaconda upload --label dev noarch/*.tar.bz From 7db2c6e072974d577b671ac8ae1fc988ea99397c Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:33:27 -0700 Subject: [PATCH 2/3] Revert "Upload package in separate step with anaconda" This reverts commit bf330065c2045a680ae3ef23fff0bec8ce0a7b8a. --- .github/workflows/test.yml | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e96ec63ea..ffc434f4c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -220,22 +220,16 @@ jobs: export VERSION_SUFFIX=`date +%y%m%d` conda build continuous_integration/recipe --no-anaconda-upload - - name: Build conda package - shell: bash -l {0} - run: | - # suffix for nightly package versions - export VERSION_SUFFIX=`date +%y%m%d` - - mamba build continuous_integration/recipe \ - --no-anaconda-upload \ - --output-folder . - - name: Upload conda package + - name: Build and upload conda package if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'dask-contrib/dask-sql' }} shell: bash -l {0} env: ANACONDA_API_TOKEN: ${{ secrets.DASK_CONDA_TOKEN }} run: | - # install anaconda for upload - mamba install anaconda + # suffix for nightly package versions + export VERSION_SUFFIX=`date +%y%m%d` - anaconda upload --label dev noarch/*.tar.bz + # set conda to upload after building + conda config --set anaconda_upload yes + + conda build continuous_integration/recipe --label dev From 2e756b2c07ac55cf029c0713855042fc1e524c8b Mon Sep 17 00:00:00 2001 From: Charles Blackmon-Luca <20627856+charlesbluca@users.noreply.github.com> Date: Tue, 19 Oct 2021 16:33:28 -0700 Subject: [PATCH 3/3] Revert "Trying using conda instead of mamba for builds" This reverts commit 4d9f1e3577523143017dbbfd2f36aa8f556b2eda. --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ffc434f4c..51f08d7d4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -219,7 +219,7 @@ jobs: # suffix for nightly package versions export VERSION_SUFFIX=`date +%y%m%d` - conda build continuous_integration/recipe --no-anaconda-upload + mamba build continuous_integration/recipe --no-anaconda-upload - name: Build and upload conda package if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'dask-contrib/dask-sql' }} shell: bash -l {0} @@ -232,4 +232,4 @@ jobs: # set conda to upload after building conda config --set anaconda_upload yes - conda build continuous_integration/recipe --label dev + mamba build continuous_integration/recipe --label dev