diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml index 72126521..07f9096e 100644 --- a/.github/workflows/conda-package.yml +++ b/.github/workflows/conda-package.yml @@ -239,12 +239,15 @@ jobs: - name: Install anaconda-client run: conda install anaconda-client + - name: Package version + run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV + - name: Upload run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2 env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} - name: Upload Wheels - 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 }} env: ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }} diff --git a/conda-recipe/bld.bat b/conda-recipe/bld.bat index 838a6fa2..f08875ae 100644 --- a/conda-recipe/bld.bat +++ b/conda-recipe/bld.bat @@ -45,7 +45,7 @@ if EXIST "%PLATFORM_DIR%" ( @REM %PYTHON% -m pip install --no-index --no-deps --no-build-isolation . -v if NOT "%WHEELS_OUTPUT_FOLDER%"=="" ( rem Install and assemble wheel package from the build bits - "%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt bdist_wheel + "%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt bdist_wheel --build-number %GIT_DESCRIBE_NUMBER% if errorlevel 1 exit 1 copy dist\dpbench*.whl %WHEELS_OUTPUT_FOLDER% if errorlevel 1 exit 1 diff --git a/conda-recipe/build.sh b/conda-recipe/build.sh index a2bcb347..544ce140 100644 --- a/conda-recipe/build.sh +++ b/conda-recipe/build.sh @@ -25,7 +25,7 @@ fi # Build wheel package if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then - $PYTHON setup.py install --single-version-externally-managed --record=record.txt bdist_wheel -p manylinux2014_x86_64 + $PYTHON setup.py install --single-version-externally-managed --record=record.txt bdist_wheel -p manylinux2014_x86_64 --build-number $GIT_DESCRIBE_NUMBER mkdir -p ${WHEELS_OUTPUT_FOLDER} cp dist/dpbench*.whl ${WHEELS_OUTPUT_FOLDER} else