diff --git a/.github/workflows/after_release.yml b/.github/workflows/after_release.yml index 2dc84072096..9fb93ee27d5 100644 --- a/.github/workflows/after_release.yml +++ b/.github/workflows/after_release.yml @@ -29,14 +29,10 @@ jobs: steps: - name: after_release::rebuild_releases_page::refresh_cloud_releases run: curl -fX POST "https://cloud.zed.dev/releases/refresh?expect_tag=$TAG_NAME" - - name: steps::checkout_repo - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd - with: - clean: false - - name: after_release::rebuild_releases_page::redeploy_zed_dev - run: ./script/redeploy-vercel + - name: after_release::rebuild_releases_page::revalidate_zed_dev + run: 'curl -fX GET "https://zed.dev/api/revalidate?tag=releases" -H "Authorization: Bearer $ZED_DEV_REVALIDATE_TOKEN"' env: - VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }} + ZED_DEV_REVALIDATE_TOKEN: ${{ secrets.ZED_DEV_REVALIDATE_TOKEN }} deploy_docs: if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions') permissions: diff --git a/script/redeploy-vercel b/script/redeploy-vercel deleted file mode 100755 index 0b253d99ab8..00000000000 --- a/script/redeploy-vercel +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -if [[ -z "${VERCEL_TOKEN:-}" ]]; then - echo "Error: VERCEL_TOKEN environment variable is not set." - echo "Get a token from https://vercel.com/account/tokens" - exit 1 -fi - -MAX_ATTEMPTS="60" -SLEEP_SECONDS="10" -VERCEL_SCOPE="zed-industries" -VERCEL_URL="https://zed.dev" - -echo "Checking for in-progress deployments..." - -for ((i=1; i<=MAX_ATTEMPTS; i++)); do - RESPONSE=$(curl -s -H "Authorization: Bearer $VERCEL_TOKEN" \ - "https://api.vercel.com/v6/deployments?slug=${VERCEL_SCOPE}&state=BUILDING,INITIALIZING,QUEUED&target=production&limit=1") - - COUNT=$(echo "$RESPONSE" | jq '.deployments | length') - - if [ "$COUNT" = "0" ]; then - echo "No in-progress deployments found. Proceeding with redeploy." - break - fi - - if [ "$i" = "$MAX_ATTEMPTS" ]; then - echo "Timed out waiting for deployments to complete after $((MAX_ATTEMPTS * SLEEP_SECONDS)) seconds." - exit 1 - fi - - echo "Attempt $i/$MAX_ATTEMPTS: Found $COUNT in-progress deployment(s). Waiting ${SLEEP_SECONDS}s..." - sleep "$SLEEP_SECONDS" -done - -echo "Triggering redeploy of ${VERCEL_URL}..." -npm exec --yes -- vercel@37 --token="$VERCEL_TOKEN" --scope "$VERCEL_SCOPE" redeploy "$VERCEL_URL" diff --git a/tooling/xtask/src/tasks/workflows/after_release.rs b/tooling/xtask/src/tasks/workflows/after_release.rs index fe96325c7fd..bb363736c34 100644 --- a/tooling/xtask/src/tasks/workflows/after_release.rs +++ b/tooling/xtask/src/tasks/workflows/after_release.rs @@ -62,8 +62,11 @@ fn rebuild_releases_page() -> NamedJob { named::bash("curl -fX POST \"https://cloud.zed.dev/releases/refresh?expect_tag=$TAG_NAME\"") } - fn redeploy_zed_dev() -> Step { - named::bash("./script/redeploy-vercel").add_env(("VERCEL_TOKEN", vars::VERCEL_TOKEN)) + fn revalidate_zed_dev() -> Step { + named::bash( + "curl -fX GET \"https://zed.dev/api/revalidate?tag=releases\" -H \"Authorization: Bearer $ZED_DEV_REVALIDATE_TOKEN\"", + ) + .add_env(("ZED_DEV_REVALIDATE_TOKEN", vars::ZED_DEV_REVALIDATE_TOKEN)) } named::job( @@ -71,8 +74,7 @@ fn rebuild_releases_page() -> NamedJob { .runs_on(runners::LINUX_SMALL) .with_repository_owner_guard() .add_step(refresh_cloud_releases()) - .add_step(checkout_repo()) - .add_step(redeploy_zed_dev()), + .add_step(revalidate_zed_dev()), ) } diff --git a/tooling/xtask/src/tasks/workflows/vars.rs b/tooling/xtask/src/tasks/workflows/vars.rs index 8b4ff10bc5a..24dc37c73a9 100644 --- a/tooling/xtask/src/tasks/workflows/vars.rs +++ b/tooling/xtask/src/tasks/workflows/vars.rs @@ -41,7 +41,7 @@ secret!(ZED_ZIPPY_APP_ID); secret!(ZED_ZIPPY_APP_PRIVATE_KEY); secret!(DISCORD_WEBHOOK_RELEASE_NOTES); secret!(WINGET_TOKEN); -secret!(VERCEL_TOKEN); +secret!(ZED_DEV_REVALIDATE_TOKEN); secret!(SLACK_WEBHOOK_WORKFLOW_FAILURES); secret!(R2_ACCOUNT_ID); secret!(R2_ACCESS_KEY_ID);