chore: fix login and approve

bytebase · Mar 4, 2024 · d539748 · d539748
1 parent b61a746
commit d539748
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.github/actions/login/dist/index.js b/.github/actions/login/dist/index.js
@@ -62,9 +62,10 @@ function run() {
         });
         const loginResData = yield loginRes.json();
         if (!loginResData.token) {
-            throw new Error("Failed to generate token for user: " + service_account + ". Please check the service account and key.");
+            throw new Error("Failed to obtain token for user: " + service_account + ". Please check the service account and key.");
         }
-        return loginResData.token;
+        core.info("Login successful for user: " + service_account + ". Token obtained.");
+        core.setOutput('token', loginResData.token);
     });
 }
 run();

diff --git a/.github/actions/login/index.ts b/.github/actions/login/index.ts
@@ -24,10 +24,11 @@ async function run(): Promise<void> {
   });
   const loginResData = await loginRes.json();
   if (!loginResData.token) {
-    throw new Error("Failed to generate token for user: " + service_account + ". Please check the service account and key.");
+    throw new Error("Failed to obtain token for user: " + service_account + ". Please check the service account and key.");
   }
-
-  return loginResData.token;
+
+  core.info("Login successful for user: " + service_account + ". Token obtained.")
+  core.setOutput('token', loginResData.token); 
 }
 
 run();
diff --git a/.github/workflows/approve-migration.yml b/.github/workflows/approve-migration.yml
@@ -26,9 +26,10 @@ jobs:
             service_account: ${{ env.SERVICE_ACCOUNT }}
             service_account_key: ${{ secrets.BYTEBASE_PASSWORD }}
         - name: Approve issue
+          id: approve
           uses: ./.github/actions/approve
           with:
             endpoint: ${{ env.API_ENDPOINT }}
-            token: ${{steps.login.outputs.token}}
+            token: ${{ steps.login.outputs.token }}
             issue_id: 114
             comment: "Approved by CI"