diff --git a/.github/workflows/deploy_conda_package.yml b/.github/workflows/deploy_conda_package.yml index b8e9d54bb..67603c4d4 100644 --- a/.github/workflows/deploy_conda_package.yml +++ b/.github/workflows/deploy_conda_package.yml @@ -23,18 +23,28 @@ jobs: include: # real versions - OS: ubuntu-latest - BUILD_DIR: linux-64 + TARGET: linux-64 + SCALAR: real + + - OS: macos-latest + TARGET: osx-64 + SCALAR: real # complex versions + - OS: ubuntu-latest + TARGET: linux-64 + SCALAR: complex + - OS: macos-latest - BUILD_DIR: osx-64 + TARGET: osx-64 + SCALAR: complex - name: TACS Conda Package Deployment (${{ matrix.OS }}) + name: TACS Conda Package Deployment (${{ matrix.TARGET }}, ${{ matrix.SCALAR }}) # Recommended if you intend to make multiple deployments in quick succession. # This will kill any currently running CI from previous commits to the same branch concurrency: - group: ci-${{ github.ref }}-${{ matrix.OS }} + group: ci-${{ github.ref }}-${{ matrix.TARGET }}-${{ matrix.SCALAR }} cancel-in-progress: true steps: @@ -62,9 +72,14 @@ jobs: export TACS_DIR=${GITHUB_WORKSPACE}; echo "TACS_DIR=${GITHUB_WORKSPACE}" >> $GITHUB_ENV; export ANACONDA_API_TOKEN=${{ secrets.ANACONDA_TOKEN }}; + export BUILD_ARGS="--no-include-recipe ${{ matrix.EXTRA_ARGS }}"; + if [[ ${{ matrix.SCALAR }} == "complex" ]]; then + export LABEL="complex" + elif [[ ${{ matrix.SCALAR }} == "real" ]]; then + export LABEL="main" + fi conda install anaconda-client conda-build conda-verify -q -y; conda config --set anaconda_upload no; cd ${TACS_DIR}/conda; - conda build --no-include-recipe -c conda-forge -c smdogroup --output-folder . .; - anaconda upload --label main ${{ matrix.BUILD_DIR }}/*real*.tar.bz2 --force; - anaconda upload --label complex ${{ matrix.BUILD_DIR }}/*complex*.tar.bz2 --force; + conda build --variants "{scalar: ${{ matrix.SCALAR }}}" -c conda-forge -c smdogroup $BUILD_ARGS --output-folder . .; + anaconda upload --label $LABEL ${{ matrix.TARGET }}/*.tar.bz2 --force;