fix: require both vercel-org-id and vercel-project-id for deployment (#304)

* fix: require both vercel-org-id and vercel-project-id for deployment

Vercel CLI requires both VERCEL_ORG_ID and VERCEL_PROJECT_ID to be set
together. Previously, setting only vercel-project-id without vercel-org-id
caused a CLI error.

- skip setting VERCEL_PROJECT_ID when vercel-org-id is missing and warn
- also remove VERCEL_PROJECT_ID in the personal account retry path
- add missing vercel-org-id to example-static, example-angular, and deploy workflows

* fix: update retry warning message to reflect both env vars removal

* fix: skip VERCEL_ORG_ID when vercel-project-id is not provided

Align the behavior for missing vercel-project-id with the existing
behavior for missing vercel-org-id: warn and skip the env var instead
of exporting a partial configuration that can cause Vercel CLI v41+
scope errors.

Author: amondnet

.github/workflows/deploy.yml

@@ -16,6 +16,7 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
           github-comment: false
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
       - name: preview-url
         run: |

.github/workflows/example-angular.yml

@@ -34,6 +34,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_ANGULAR }}
           working-directory: example/angular/dist/angular
           alias-domains: |
@@ -45,6 +46,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_ANGULAR }}
           working-directory: example/angular/dist/angular
           vercel-args: '--prod '

.github/workflows/example-static.yml

@@ -17,6 +17,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
           working-directory: example/static
           alias-domains: |
@@ -39,6 +40,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-token: ${{ secrets.VERCEL_TOKEN }}
+          vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
           vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
           vercel-args: ${{ steps.prod_or_not.outputs.vercel-args }}
           working-directory: example/static

dist/index.js

@@ -59685,14 +59685,26 @@ if (githubToken) {
 async function setEnv() {
   core.info('set environment for vercel cli')
   core.exportVariable('VERCEL_TELEMETRY_DISABLED', '1')
-  if (vercelOrgId) {
+  if (vercelOrgId && vercelProjectId) {
     core.info('set env variable : VERCEL_ORG_ID')
     core.exportVariable('VERCEL_ORG_ID', vercelOrgId)
-  }
-  if (vercelProjectId) {
     core.info('set env variable : VERCEL_PROJECT_ID')
     core.exportVariable('VERCEL_PROJECT_ID', vercelProjectId)
   }
+  else if (vercelOrgId) {
+    core.warning(
+      'vercel-org-id was provided without vercel-project-id. '
+      + 'Vercel CLI v41+ requires both to be set together. '
+      + 'Skipping VERCEL_ORG_ID to avoid deployment failure.',
+    )
+  }
+  else if (vercelProjectId) {
+    core.warning(
+      'vercel-project-id was provided without vercel-org-id. '
+      + 'Vercel CLI v41+ requires both to be set together. '
+      + 'Skipping VERCEL_PROJECT_ID to avoid deployment failure.',
+    )
+  }
 }
 
 function addVercelMetadata(key, value, providedArgs) {
@@ -59798,9 +59810,10 @@ async function vercelDeploy(ref, commit, sha, commitOrg, commitRepo) {
       }
       core.warning(
         'Vercel CLI rejected the org ID as a personal account scope. '
-        + 'Retrying without VERCEL_ORG_ID (VERCEL_PROJECT_ID is still set).',
+        + 'Retrying without VERCEL_ORG_ID and VERCEL_PROJECT_ID.',
       )
       delete process.env.VERCEL_ORG_ID
+      delete process.env.VERCEL_PROJECT_ID
 
       const originalOutput = myOutput
       const originalError = myError

index.js

@@ -100,14 +100,26 @@ if (githubToken) {
 async function setEnv() {
   core.info('set environment for vercel cli')
   core.exportVariable('VERCEL_TELEMETRY_DISABLED', '1')
-  if (vercelOrgId) {
+  if (vercelOrgId && vercelProjectId) {
     core.info('set env variable : VERCEL_ORG_ID')
     core.exportVariable('VERCEL_ORG_ID', vercelOrgId)
-  }
-  if (vercelProjectId) {
     core.info('set env variable : VERCEL_PROJECT_ID')
     core.exportVariable('VERCEL_PROJECT_ID', vercelProjectId)
   }
+  else if (vercelOrgId) {
+    core.warning(
+      'vercel-org-id was provided without vercel-project-id. '
+      + 'Vercel CLI v41+ requires both to be set together. '
+      + 'Skipping VERCEL_ORG_ID to avoid deployment failure.',
+    )
+  }
+  else if (vercelProjectId) {
+    core.warning(
+      'vercel-project-id was provided without vercel-org-id. '
+      + 'Vercel CLI v41+ requires both to be set together. '
+      + 'Skipping VERCEL_PROJECT_ID to avoid deployment failure.',
+    )
+  }
 }
 
 function addVercelMetadata(key, value, providedArgs) {
@@ -213,9 +225,10 @@ async function vercelDeploy(ref, commit, sha, commitOrg, commitRepo) {
       }
       core.warning(
         'Vercel CLI rejected the org ID as a personal account scope. '
-        + 'Retrying without VERCEL_ORG_ID (VERCEL_PROJECT_ID is still set).',
+        + 'Retrying without VERCEL_ORG_ID and VERCEL_PROJECT_ID.',
       )
       delete process.env.VERCEL_ORG_ID
+      delete process.env.VERCEL_PROJECT_ID
 
       const originalOutput = myOutput
       const originalError = myError