Skip to content

Commit f62f074

Browse files
authored
Merge pull request #304 from IntelPython/fix/wheel_upload
Upload wheel to the same version
2 parents eec58be + 90de5dc commit f62f074

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/workflows/conda-package.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,15 @@ jobs:
239239
- name: Install anaconda-client
240240
run: conda install anaconda-client
241241

242+
- name: Package version
243+
run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
244+
242245
- name: Upload
243246
run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
244247
env:
245248
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
246249

247250
- name: Upload Wheels
248-
run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl
251+
run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl --version ${{ env.PACKAGE_VERSION }}
249252
env:
250253
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}

conda-recipe/bld.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ if EXIST "%PLATFORM_DIR%" (
4545
@REM %PYTHON% -m pip install --no-index --no-deps --no-build-isolation . -v
4646
if NOT "%WHEELS_OUTPUT_FOLDER%"=="" (
4747
rem Install and assemble wheel package from the build bits
48-
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt bdist_wheel
48+
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt bdist_wheel --build-number %GIT_DESCRIBE_NUMBER%
4949
if errorlevel 1 exit 1
5050
copy dist\dpbench*.whl %WHEELS_OUTPUT_FOLDER%
5151
if errorlevel 1 exit 1

conda-recipe/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ fi
2525

2626
# Build wheel package
2727
if [ -n "${WHEELS_OUTPUT_FOLDER}" ]; then
28-
$PYTHON setup.py install --single-version-externally-managed --record=record.txt bdist_wheel -p manylinux2014_x86_64
28+
$PYTHON setup.py install --single-version-externally-managed --record=record.txt bdist_wheel -p manylinux2014_x86_64 --build-number $GIT_DESCRIBE_NUMBER
2929
mkdir -p ${WHEELS_OUTPUT_FOLDER}
3030
cp dist/dpbench*.whl ${WHEELS_OUTPUT_FOLDER}
3131
else

0 commit comments

Comments
 (0)