some cleanup. separating and Upgrading test.pypi

SCIInstitute · Oct 11, 2023 · 0f2b8fd · 0f2b8fd
1 parent 3554a58
commit 0f2b8fd
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 15 deletions.
diff --git a/.github/workflows/pypublish.yml b/.github/workflows/pypublish.yml
@@ -7,13 +7,13 @@ on:
 jobs:
   build-wheel:
     uses: ./.github/workflows/pypackage.yml
-  upload_pypi:
-    name: Publish build to TestPyPI and PyPI
+  upload_testpypi:
+    name: Publish build to TestPyPI
     needs: [build-wheel]
     runs-on: ubuntu-latest
     environment:
       name: pypi
-      url: https://pypi.org/p/UncertainSCI
+      url: https://test.pypi.org/p/UncertainSCI
     permissions:
       id-token: write
     steps:
@@ -25,14 +25,21 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist
-          repository-url: https://test.pypi.org/legacy/
-          password: ${{ secrets.TESTPYPI_API_TOKEN }}
-#          configuration-path: ${{ inputs.config-path }}
-#          secrets: inherit
+  upload_pypi:
+    name: Publish build to PyPI
+    needs: [build-wheel, upload_testpypi]
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/UncertainSCI
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: artifact
+          path: dist
       - name: Upload to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist
-#        with:
-#          configuration-path: ${{ inputs.config-path }}
-#          secrets: inherit
diff --git a/.github/workflows/testpackage.yml b/.github/workflows/testpackage.yml
@@ -4,8 +4,3 @@ on: #[push, pull_request]
 jobs:
   buildwheel:
     uses: ./.github/workflows/pypackage.yml
-#      with:
-#        configuration-path: ${{ inputs.config-path }}
-#      secrets:
-#        envPAT: ${{ secrets.envPAT }}
-