Skip to content

Commit 1b0001f

Browse files
authored
fix: auto-retry deployment when personal account org ID causes scope error (#298)
* fix: auto-retry deployment when personal account org ID causes scope error Vercel CLI v41+ rejects VERCEL_ORG_ID for personal accounts with "You cannot set your Personal Account as the scope" error. - Catch the scope error and retry without VERCEL_ORG_ID using --project flag - Remove vercel-org-id from personal account CI workflows - Rebuild dist/ * fix: address code review findings in personal account retry logic - Restore independent VERCEL_PROJECT_ID export (was incorrectly nested) - Clear process.env.VERCEL_ORG_ID for in-process retry subprocess - Guard retry with vercelProjectId check for actionable error message * fix: skip --scope on retry and fix VERCEL_ORG_ID deletion order - Remove --scope from retry path to prevent personal-account error from recurring on the fallback attempt - Swap order of exportVariable/delete so process.env.VERCEL_ORG_ID is cleared after GITHUB_ENV is written, not before
1 parent b591ac8 commit 1b0001f

6 files changed

Lines changed: 31132 additions & 27885 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ jobs:
1616
github-token: ${{ secrets.GITHUB_TOKEN }}
1717
vercel-token: ${{ secrets.VERCEL_TOKEN }}
1818
github-comment: false
19-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
2019
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
2120
- name: preview-url
2221
run: |

.github/workflows/example-angular.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
with:
3535
github-token: ${{ secrets.GITHUB_TOKEN }}
3636
vercel-token: ${{ secrets.VERCEL_TOKEN }}
37-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
3837
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_ANGULAR }}
3938
working-directory: example/angular/dist/angular
4039
alias-domains: |
@@ -46,7 +45,6 @@ jobs:
4645
with:
4746
github-token: ${{ secrets.GITHUB_TOKEN }}
4847
vercel-token: ${{ secrets.VERCEL_TOKEN }}
49-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
5048
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_ANGULAR }}
5149
working-directory: example/angular/dist/angular
5250
vercel-args: '--prod '

.github/workflows/example-nextjs.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ jobs:
4444
with:
4545
github-token: ${{ secrets.GITHUB_TOKEN }}
4646
vercel-token: ${{ secrets.VERCEL_TOKEN }}
47-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
4847
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_NEXTJS }}
4948
vercel-args: --prebuilt
5049
working-directory: example/nextjs
@@ -75,7 +74,6 @@ jobs:
7574
with:
7675
github-token: ${{ secrets.GITHUB_TOKEN }}
7776
vercel-token: ${{ secrets.VERCEL_TOKEN }}
78-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
7977
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_NEXTJS }}
8078
vercel-args: ${{ steps.prod_or_not.outputs.vercel-args }}
8179
working-directory: example/nextjs

.github/workflows/example-static.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
with:
1818
github-token: ${{ secrets.GITHUB_TOKEN }}
1919
vercel-token: ${{ secrets.VERCEL_TOKEN }}
20-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
2120
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
2221
working-directory: example/static
2322
alias-domains: |
@@ -40,7 +39,6 @@ jobs:
4039
with:
4140
github-token: ${{ secrets.GITHUB_TOKEN }}
4241
vercel-token: ${{ secrets.VERCEL_TOKEN }}
43-
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
4442
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID_STATIC }}
4543
vercel-args: ${{ steps.prod_or_not.outputs.vercel-args }}
4644
working-directory: example/static

0 commit comments

Comments
 (0)