Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge #4

Merged
merged 33 commits into from
Jan 28, 2024
Merged
Changes from 11 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5a7b9ab
Fix: Routes `/api/cors/[...path]` was not configured to run with the …
wyxogo Jan 8, 2024
a06a298
Merge branch 'ChatGPTNextWeb:main' into upstream
wyxogo Jan 11, 2024
7ec29c2
add workflows/deploy preview
Jan 24, 2024
bdc25ad
add delete preview scripts
Jan 24, 2024
3bc771a
add workflow_dispatch
Jan 24, 2024
998c95d
test pr deploy
Jan 24, 2024
04fe9fa
add workflows/deploy preview
Jan 24, 2024
8fb3446
add delete preview scripts
Jan 24, 2024
0739ced
add workflow_dispatch
Jan 24, 2024
2f11e7c
test pr deploy
Jan 25, 2024
94f534f
fix vercel alias domains
Jan 25, 2024
628f3ba
Merge branch 'ChatGPTNextWeb:sgm/cicd' into sgm/cicd
sungaomeng Jan 25, 2024
6206ceb
fix: cicd , add pull_request_target
Jan 25, 2024
04855de
Merge pull request #3789 from wyxogo/upstream
fred-bf Jan 25, 2024
43631a3
fix: cicd, vercel domain suffix secret
Jan 25, 2024
f619e9d
chore: change default submit key
fred-bf Jan 25, 2024
a4c1f1a
Merge branch 'main' into sgm/cicd
sungaomeng Jan 25, 2024
1132816
Merge pull request #2 from sungaomeng/sgm/cicd
sungaomeng Jan 25, 2024
5ce1a55
Merge pull request #3909 from sungaomeng/main
fred-bf Jan 25, 2024
fae82a3
fix: cicd, delete vercel pre
Jan 25, 2024
ba3e7e7
fix: cicd, vercel alias domain
Jan 25, 2024
32bcdb8
fix: cicd, delete vercel pre (#3910)
sungaomeng Jan 25, 2024
b2f7bdc
Merge branch 'ChatGPTNextWeb:main' into main
sungaomeng Jan 25, 2024
15d25df
fix: cicd, delete velcel pre
Jan 25, 2024
ecbab75
fix: cicd, alias domain env name
Jan 25, 2024
ca08062
Merge pull request #3913 from sungaomeng/main
sungaomeng Jan 25, 2024
148c32a
fix: cicd, remove workflow_dispatch
Jan 25, 2024
1c73c6c
Merge pull request #3917 from sungaomeng/main
fred-bf Jan 25, 2024
3fa55f9
fix: cicd, checkout sha
Jan 25, 2024
118e8f5
fix: cicd, checkout sha Merge pull request #3920 from sungaomeng/main
sungaomeng Jan 25, 2024
981a362
Add gpt-4-0125-preview (#3924)
leo4life2 Jan 26, 2024
f6cdda9
update google api region (#3934)
NieXi Jan 27, 2024
91a5f4a
Feat Models [GPT-4-turbo] (#3932)
H0llyW00dzZ Jan 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
name: VercelPreviewDeployment

on:
pull_request_target:
types:
- opened
- synchronize
workflow_dispatch:
inputs:
branchName:
description: 'Branch to deploy'
required: true

env:
VERCEL_TEAM: ${{ secrets.VERCEL_TEAM }}
VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
VERCEL_DOMAIN_SUFFIX: ".pr.nextchat.dev"
VERCEL_PR_DOMAIN_SUFFIX: ${{ secrets.VERCEL_PR_DOMAIN_SUFFIX }}

permissions:
contents: read
Expand Down Expand Up @@ -42,7 +43,7 @@ jobs:
id: set_env
if: github.event_name == 'pull_request'
run: |
echo "VERCEL_ALIAS_DOMAIN=${{ github.event.pull_request.number }}-${{ github.workflow }}.${VERCEL_DOMAIN_SUFFIX}" >> $GITHUB_OUTPUT
echo "VERCEL_ALIAS_DOMAIN=${{ github.event.pull_request.number }}-${{ github.workflow }}.${VERCEL_PR_DOMAIN_SUFFIX}" >> $GITHUB_OUTPUT

- name: Install Vercel CLI
run: npm install --global vercel@latest
Expand All @@ -63,14 +64,13 @@ jobs:
env:
META_TAG: ${{ steps.hash_branch.outputs.digest }}-${{ github.run_number }}-${{ github.run_attempt}}
run: |
env
vercel pull --yes --environment=preview --token=${VERCEL_TOKEN}
vercel build --token=${VERCEL_TOKEN}
vercel deploy --prebuilt --archive=tgz --token=${VERCEL_TOKEN} --meta base_hash=${{ env.META_TAG }}

vercel ls --token=${VERCEL_TOKEN} --meta base_hash=${{ env.META_TAG }} &> vercel-output
DEFAULT_URL=$(cat vercel-output | grep http | awk '{print $2}')
ALIAS_URL=$(vercel alias set ${DEFAULT_URL} ${{ steps.set_env.outputs.VERCEL_ALIAS_DOMAIN }} --token=${VERCEL_TOKEN} | awk '{print $3}')
ALIAS_URL=$(vercel alias set ${DEFAULT_URL} ${{ steps.set_env.outputs.VERCEL_ALIAS_DOMAIN }} --token=${VERCEL_TOKEN} --scope ${VERCEL_TEAM}| awk '{print $3}')

echo "New preview URL: ${DEFAULT_URL}"
echo "New alias URL: ${ALIAS_URL}"
Expand All @@ -82,4 +82,4 @@ jobs:
message: |
Your build has completed!

[Preview deployment](${{ steps.vercel.outputs.VERCEL_URL }})
[Preview deployment](${{ steps.vercel.outputs.VERCEL_URL }})