Upload wheel to the same version

IntelPython · Oct 10, 2023 · 9ac93f0 · 9ac93f0
1 parent eec58be
commit 9ac93f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/conda-package.yml b/.github/workflows/conda-package.yml
@@ -213,9 +213,9 @@ jobs:
 
     continue-on-error: false
 
-    if: |
-      (github.repository == 'IntelPython/dpbench') &&
-      (github.ref == 'refs/heads/main' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
+    # if: |
+    #   (github.repository == 'IntelPython/dpbench') &&
+    #   (github.ref == 'refs/heads/main' || (startsWith(github.ref, 'refs/heads/release') == true) || github.event_name == 'push' && contains(github.ref, 'refs/tags/'))
 
     steps:
       - name: Download artifact
@@ -239,12 +239,15 @@ jobs:
       - name: Install anaconda-client
         run: conda install anaconda-client
 
-      - name: Upload
-        run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
+      - name: Package version
+        run: echo "PACKAGE_VERSION=$(basename ${{ env.PACKAGE_NAME }}-*.tar.bz2 | sed 's/^${{ env.PACKAGE_NAME }}-\([^-]*\).*/\1/')" >> $GITHUB_ENV
+
+      - name: Upload Wheels
+        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 }}
 
-      - name: Upload Wheels
-        run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.whl
+      - name: Upload
+        run: anaconda --token ${{ env.ANACONDA_TOKEN }} upload --user dppy --label dev ${{ env.PACKAGE_NAME }}-*.tar.bz2
         env:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
diff --git 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_TAG%
     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
@@ -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_TAG
     mkdir -p ${WHEELS_OUTPUT_FOLDER}
     cp dist/dpbench*.whl ${WHEELS_OUTPUT_FOLDER}
 else