Fix upload issue when package already existed on PyPI (#297)

* update Makefile

* fix an upload issue where package already existed on PyPi

* missed one place

* adjust order

* fix a bug

Author: dhuangnm

.github/workflows/upload.yml

@@ -97,28 +97,36 @@ jobs:
                 run_id: ${{ inputs.run_id }}
                 asset_identifier: 'compressed*.whl'
 
+            - name: check if whl is new
+              id: check-whl
+              uses: neuralmagic/nm-actions/actions/check-whl-on-pypi@scm
+              with:
+                whl: ${{ steps.find-asset-whl.outputs.asset }}
+
             - name: upload whl to "nm-pypi"
-              if: ${{ inputs.push_to_pypi }}
+              if: ${{ inputs.push_to_pypi && steps.check-whl.outputs.status }}
               uses: neuralmagic/nm-actions/actions/gcp-upload-asset@v1.1.0
               with:
                 bucket_target: ${{ secrets.GCP_NM_PYPI_DIST }}
                 asset: ${{ steps.find-asset-whl.outputs.asset }}
 
             - name: find tar.gz
+              if: ${{ steps.check-whl.outputs.status }}
               id: find-asset-targz
               uses: neuralmagic/nm-actions/actions/find-asset@v1.1.0
               with:
                 run_id: ${{ inputs.run_id }}
                 asset_identifier: 'compressed*.tar.gz'
 
             - name: upload tar.gz to "nm-pypi"
-              if: ${{ inputs.push_to_pypi }}
+              if: ${{ inputs.push_to_pypi && steps.check-whl.outputs.status }}
               uses: neuralmagic/nm-actions/actions/gcp-upload-asset@v1.1.0
               with:
                 bucket_target: ${{ secrets.GCP_NM_PYPI_DIST }}
                 asset: ${{ steps.find-asset-targz.outputs.asset }}
 
             - name: update "nm-pypi" index
+              if: ${{ steps.check-whl.outputs.status }}
               uses: actions/github-script@v6
               with:
                 github-token: ${{ secrets.NM_PYPI_WORKFLOW }}
@@ -133,7 +141,7 @@ jobs:
 
             # publish the wheel file to public pypi
             - name: push wheel to pypi.org
-              if: ${{ inputs.push_to_pypi }}
+              if: ${{ inputs.push_to_pypi && steps.check-whl.outputs.status }}
               uses: neuralmagic/nm-actions/actions/publish-whl@v1.0.0
               with:
                 username: ${{ secrets.PYPI_PUBLIC_USER }}
@@ -142,7 +150,7 @@ jobs:
 
             # publish the tar.gz file to public pypi
             - name: push wheel to pypi.org
-              if: ${{ inputs.push_to_pypi }}
+              if: ${{ inputs.push_to_pypi && steps.check-whl.outputs.status }}
               uses: neuralmagic/nm-actions/actions/publish-whl@v1.0.0
               with:
                 username: ${{ secrets.PYPI_PUBLIC_USER }}

Makefile

@@ -1,6 +1,6 @@
 .PHONY: build docs test
 
-BUILD_ARGS := dev # set nightly to build nightly release
+BUILD_TYPE ?= dev # set nightly to build nightly release
 PYCHECKDIRS := src tests
 PYCHECKGLOBS := 'src/**/*.py' 'tests/**/*.py' 'utils/**/*.py' 'examples/**/*.py' setup.py
 # run checks on all files for the repo
@@ -28,7 +28,7 @@ test:
 # creates wheel file
 build:
 	@echo "Building the wheel for the repository";
-	BUILD_TYPE=$(BUILD_ARGS) python3 setup.py sdist bdist_wheel;
+	BUILD_TYPE=$(BUILD_TYPE) python3 setup.py sdist bdist_wheel;
 
 # clean package
 clean: