From e6e98242cea3a47446d1396445b3c30cdc3a799c Mon Sep 17 00:00:00 2001
From: saileshwar-skyflow <saileshwar.bogam@skyflow.com>
Date: Mon, 11 Nov 2024 18:14:07 +0530
Subject: [PATCH] SK-1731: Updated internal and public release yml files

---
 .github/workflows/internal-release.yml        |  5 -----
 .github/workflows/release.yml                 |  1 -
 .github/workflows/shared-build-and-deploy.yml | 19 ++++---------------
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/internal-release.yml b/.github/workflows/internal-release.yml
index 485bacd..7db0e44 100644
--- a/.github/workflows/internal-release.yml
+++ b/.github/workflows/internal-release.yml
@@ -17,9 +17,4 @@ jobs:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: ${{ github.ref_name }}
-      artifactory-username: ${{ secrets.JFROG_USERNAME }}
-      artifactory-password: ${{ secrets.JFROG_PASSWORD }}
       is-internal: true
-    secrets:
-      JFROG_USERNAME: ${{ secrets.JFROG_USERNAME }}
-      JFROG_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 25fcdeb..e62557d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,5 +14,4 @@ jobs:
     uses: ./.github/workflows/shared-build-and-deploy.yml
     with:
       ref: main
-      pypi-token: ${{ secrets.PYPI_PUBLISH_TOKEN }}
       is-internal: false
diff --git a/.github/workflows/shared-build-and-deploy.yml b/.github/workflows/shared-build-and-deploy.yml
index 20d67e4..92a3ea8 100644
--- a/.github/workflows/shared-build-and-deploy.yml
+++ b/.github/workflows/shared-build-and-deploy.yml
@@ -7,18 +7,7 @@ on:
         description: 'Git reference to use (e.g., main or branch name)'
         required: true
         type: string
-      pypi-token:
-        description: 'PyPI token for publishing'
-        required: false
-        type: string
-      artifactory-username:
-        description: 'Artifactory username for internal release'
-        required: false
-        type: string
-      artifactory-password:
-        description: 'Artifactory password for internal release'
-        required: false
-        type: string
+
       is-internal:
         description: 'Flag for internal release'
         required: true
@@ -77,14 +66,14 @@ jobs:
         if: ${{ !inputs.is-internal }}
         env:
           TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ inputs.pypi-token }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PUBLISH_TOKEN }}
         run: |
           twine upload dist/*
 
       - name: Publish to JFrog Artifactory
         if: ${{ inputs.is-internal }}
         env:
-          TWINE_USERNAME: ${{ inputs.artifactory-username }}
-          TWINE_PASSWORD: ${{ inputs.artifactory-password }}
+          TWINE_USERNAME: ${{ secrets.JFROG_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.JFROG_PASSWORD }}
         run: |
           twine upload --repository-url https://prekarilabs.jfrog.io/artifactory/api/pypi/skyflow-python/ dist/*