Adjust upload/download artifact action

Signed-off-by: Johannes Mueller <[email protected]>
boschresearch · Aug 1, 2024 · df3dd63 · df3dd63
1 parent 42bb773
commit df3dd63
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 16 deletions.
diff --git a/.github/workflows/pypi-deploy-odbclient.yml b/.github/workflows/pypi-deploy-odbclient.yml
@@ -1,6 +1,7 @@
 name: Build odbclient and upload to PyPI
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -30,6 +31,7 @@ jobs:
           python setup.py bdist_wheel
       - uses: actions/upload-artifact@v2
         with:
+          name: artifact-wheel
           path: tools/odbclient/dist/*.whl
 
 
@@ -55,6 +57,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: artifact-sdist
           path: tools/odbclient/dist/*.tar.gz
 
   upload_pypi:
@@ -64,12 +67,17 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: artifact-sdist
+          path: dist
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: artifact-wheel
           path: dist
 
       - uses: pypa/gh-action-pypi-publish@master
         with:
-          user: __token__
-          password: ${{ secrets.upload_pypi }}
-          #password: ${{ secrets.test_pypi }}
-          #repository_url: https://test.pypi.org/legacy/
+          # user: __token__
+          # password: ${{ secrets.upload_pypi }}
+          password: ${{ secrets.test_pypi }}
+          repository_url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/pypi-deploy-odbserver.yml b/.github/workflows/pypi-deploy-odbserver.yml
@@ -1,6 +1,7 @@
 name: Build odbserver and upload to PyPI
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -30,6 +31,7 @@ jobs:
           python setup.py bdist_wheel
       - uses: actions/upload-artifact@v4
         with:
+          name: artifact-wheel
           path: tools/odbserver/dist/*.whl
 
 
@@ -55,6 +57,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: artifact-sdist
           path: tools/odbserver/dist/*.tar.gz
 
   upload_pypi:
@@ -64,12 +67,17 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: artifact-sdist
+          path: dist
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: artifact-wheel
           path: dist
 
       - uses: pypa/gh-action-pypi-publish@master
         with:
-          user: __token__
-          password: ${{ secrets.upload_pypi }}
-          #password: ${{ secrets.test_pypi }}
-          #repository_url: https://test.pypi.org/legacy/
+          # user: __token__
+          # password: ${{ secrets.upload_pypi }}
+          password: ${{ secrets.test_pypi }}
+          repository_url: https://test.pypi.org/legacy/
diff --git a/.github/workflows/pypi-deploy.yml b/.github/workflows/pypi-deploy.yml
@@ -1,6 +1,7 @@
 name: Build and upload to PyPI
 
 on:
+  workflow_dispatch:
   release:
     types: [published]
 
@@ -38,7 +39,8 @@ jobs:
           python setup.py bdist_wheel
       - uses: actions/upload-artifact@v4
         with:
-          path: ./dist/*.whl
+            name: artifact-wheel
+            path: ./dist/*.whl
 
 
   build_sdist:
@@ -63,6 +65,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
+          name: artifact-sdist
           path: dist/*.tar.gz
 
   upload_pypi:
@@ -72,12 +75,17 @@ jobs:
     steps:
       - uses: actions/download-artifact@v4
         with:
-          name: artifact
+          name: artifact-sdist
+          path: dist
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: artifact-wheel
           path: dist
 
       - uses: pypa/gh-action-pypi-publish@master
         with:
-          user: __token__
-          password: ${{ secrets.upload_pypi }}
-          #password: ${{ secrets.test_pypi }}
-          #repository_url: https://test.pypi.org/legacy/
+          # user: __token__
+          # password: ${{ secrets.upload_pypi }}
+          password: ${{ secrets.test_pypi }}
+          repository_url: https://test.pypi.org/legacy/