diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index dd9389c40d..032c38c5e2 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -337,6 +337,8 @@ jobs: run: conda install anaconda-client - name: Add conda to system path run: echo $CONDA/bin >> $GITHUB_PATH + - name: Package version + run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV - name: Upload env: @@ -347,7 +349,7 @@ jobs: - name: Upload Wheels env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} - run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl + run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl --version ${{ env.PACKAGE_VERSION }} upload_windows: needs: test_windows @@ -375,6 +377,10 @@ jobs: - name: Install anaconda-client run: conda install anaconda-client + - name: Package version + shell: bash -el {0} + run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV + - name: Upload env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} @@ -384,7 +390,7 @@ jobs: - name: Upload Wheels env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} - run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl + run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl --version ${{ env.PACKAGE_VERSION }} test_examples_linux: needs: build_linux diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index e92e505b63..e87254b446 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -34,7 +34,7 @@ if EXIST "%PLATFORM_DIR%" ( if NOT "%WHEELS_OUTPUT_FOLDER%"=="" ( rem Install and assemble wheel package from the build bits - "%PYTHON%" setup.py install bdist_wheel %SKBUILD_ARGS% + "%PYTHON%" setup.py install bdist_wheel --build-number %GIT_DESCRIBE_NUMBER% %SKBUILD_ARGS% if errorlevel 1 exit 1 copy dist\dpctl*.whl %WHEELS_OUTPUT_FOLDER% if errorlevel 1 exit 1 diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index 87155d3fb3..f21660ec50 100755 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -17,11 +17,7 @@ echo "${PYTHON} setup.py install ${SKBUILD_ARGS}" if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then # Install packages and assemble wheel package from built bits - if [ "$CONDA_PY" == "36" ]; then - WHEELS_BUILD_ARGS="-p manylinux1_x86_64" - else - WHEELS_BUILD_ARGS="-p manylinux2014_x86_64" - fi + WHEELS_BUILD_ARGS="-p manylinux2014_x86_64 --build-number ${GIT_DESCRIBE_NUMBER}" ${PYTHON} setup.py install bdist_wheel ${WHEELS_BUILD_ARGS} ${SKBUILD_ARGS} cp dist/dpctl*.whl ${WHEELS_OUTPUT_FOLDER} else