diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index ecc4a01..4b9f52d 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -64,7 +64,7 @@ jobs: upload: needs: build - if: ${{github.ref == 'refs/heads/main' || (startsWith(github.ref, 'refs/heads/release') == true)}} + # if: ${{github.ref == 'refs/heads/main' || (startsWith(github.ref, 'refs/heads/release') == true)}} strategy: matrix: python: ["3.9", "3.10", "3.11"] @@ -72,13 +72,18 @@ jobs: runs-on: ${{ matrix.os }} defaults: run: - shell: ${{ matrix.os == 'windows-latest' && 'cmd /C CALL {0}' || 'bash -l {0}' }} + shell: 'bash -l {0}' steps: - name: Download artifact uses: actions/download-artifact@v4 with: name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }} + - name: Download wheels artifact + uses: actions/upload-artifact@v4 + with: + name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Wheels Python ${{ matrix.python }} + - uses: conda-incubator/setup-miniconda@v3 with: auto-activate-base: true @@ -91,7 +96,7 @@ jobs: run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV - name: Upload - run: anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2 + run: anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --force --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2 - name: Upload Wheels - run: anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.MODULE_NAME }}-*.whl --version ${{ env.PACKAGE_VERSION }} + run: anaconda --token ${{ secrets.ANACONDA_TOKEN }} upload --force --user dppy --label dev ${{ env.MODULE_NAME }}-*.whl --version ${{ env.PACKAGE_VERSION }}