Merge upstream Zed (172 commits) — task 001980

.cloudflare/README.md

@@ -4,11 +4,11 @@ from Cloudflare.
 - `open-source-website-assets` is used for `install.sh`
 - `docs-proxy` is used for `https://zed.dev/docs`
 
-On push to `main`, both of these (and the files they depend on) are uploaded to Cloudflare.
+During docs deployments, both of these (and the files they depend on) are uploaded to Cloudflare.
 
 ### Deployment
 
-These functions are deployed on push to main by the deploy_cloudflare.yml workflow. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
+These functions are deployed by the docs deployment workflows. Worker Rules in Cloudflare intercept requests to zed.dev and proxy them to the appropriate workers.
 
 ### Testing
 

.cloudflare/docs-proxy/src/worker.js

@@ -1,7 +1,22 @@
 export default {
   async fetch(request, _env, _ctx) {
     const url = new URL(request.url);
-    url.hostname = "docs-anw.pages.dev";
+
+    if (url.pathname === "/docs/nightly") {
+      url.hostname = "docs-nightly.pages.dev";
+      url.pathname = "/docs/";
+    } else if (url.pathname.startsWith("/docs/nightly/")) {
+      url.hostname = "docs-nightly.pages.dev";
+      url.pathname = url.pathname.replace("/docs/nightly/", "/docs/");
+    } else if (url.pathname === "/docs/preview") {
+      url.hostname = "docs-preview-5xd.pages.dev";
+      url.pathname = "/docs/";
+    } else if (url.pathname.startsWith("/docs/preview/")) {
+      url.hostname = "docs-preview-5xd.pages.dev";
+      url.pathname = url.pathname.replace("/docs/preview/", "/docs/");
+    } else {
+      url.hostname = "docs-anw.pages.dev";
+    }
 
     let res = await fetch(url, request);
 

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Feature request
-    url: https://github.com/zed-industries/zed/discussions/new/choose
+    url: https://github.com/zed-industries/zed/discussions/new?category=feature-requests
     about: To request a feature, open a new discussion under one of the appropriate categories.
   - name: Our Discord community
     url: https://discord.com/invite/zedindustries

.github/workflows/after_release.yml

@@ -1,6 +1,9 @@
 # Generated from xtask::workflows::after_release
 # Rebuild with `cargo xtask workflows`.
 name: after_release
+env:
+  TAG_NAME: ${{ github.event.release.tag_name || inputs.tag_name }}
+  IS_PRERELEASE: ${{ github.event.release.prerelease || inputs.prerelease }}
 on:
   release:
     types:
@@ -25,7 +28,7 @@ jobs:
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:
     - name: after_release::rebuild_releases_page::refresh_cloud_releases
-      run: curl -fX POST https://cloud.zed.dev/releases/refresh?expect_tag=${{ github.event.release.tag_name || inputs.tag_name }}
+      run: curl -fX POST "https://cloud.zed.dev/releases/refresh?expect_tag=$TAG_NAME"
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
       with:
@@ -34,6 +37,18 @@ jobs:
       run: ./script/redeploy-vercel
       env:
         VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+  deploy_docs:
+    if: (github.repository_owner == 'zed-industries' || github.repository_owner == 'zed-extensions')
+    permissions:
+      contents: read
+    uses: zed-industries/zed/.github/workflows/deploy_docs.yml@main
+    secrets:
+      DOCS_AMPLITUDE_API_KEY: ${{ secrets.DOCS_AMPLITUDE_API_KEY }}
+      CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+      CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+    with:
+      channel: ${{ (github.event.release.prerelease || inputs.prerelease) && 'preview' || 'stable' }}
+      checkout_ref: ${{ github.event.release.tag_name || inputs.tag_name }}
   post_to_discord:
     needs:
     - rebuild_releases_page
@@ -43,7 +58,7 @@ jobs:
     - id: get-release-url
       name: after_release::post_to_discord::get_release_url
       run: |
-        if [ "${{ github.event.release.prerelease || inputs.prerelease }}" == "true" ]; then
+        if [ "$IS_PRERELEASE" == "true" ]; then
             URL="https://zed.dev/releases/preview"
         else
             URL="https://zed.dev/releases/stable"
@@ -55,7 +70,7 @@ jobs:
       uses: 2428392/gh-truncate-string-action@b3ff790d21cf42af3ca7579146eedb93c8fb0757
       with:
         stringToTruncate: |
-          📣 Zed [${{ github.event.release.tag_name || inputs.tag_name }}](<${{ steps.get-release-url.outputs.URL }}>)  was just released!
+          📣 Zed [${{ env.TAG_NAME }}](<${{ steps.get-release-url.outputs.URL }}>)  was just released!
 
           ${{ github.event.release.body || inputs.body }}
         maxLength: 2000
@@ -90,7 +105,7 @@ jobs:
     - id: set-package-name
       name: after_release::publish_winget::set_package_name
       run: |
-        if ("${{ github.event.release.prerelease || inputs.prerelease }}" -eq "true") {
+        if ($env:IS_PRERELEASE -eq "true") {
             $PACKAGE_NAME = "ZedIndustries.Zed.Preview"
         } else {
             $PACKAGE_NAME = "ZedIndustries.Zed"
@@ -102,7 +117,7 @@ jobs:
       uses: vedantmgoyal9/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f
       with:
         identifier: ${{ steps.set-package-name.outputs.PACKAGE_NAME }}
-        release-tag: ${{ github.event.release.tag_name || inputs.tag_name }}
+        release-tag: ${{ env.TAG_NAME }}
         max-versions-to-keep: 5
         token: ${{ secrets.WINGET_TOKEN }}
   create_sentry_release:
@@ -127,6 +142,7 @@ jobs:
     - post_to_discord
     - publish_winget
     - create_sentry_release
+    - deploy_docs
     if: failure()
     runs-on: namespace-profile-2x4-ubuntu-2404
     steps:

.github/workflows/assign_contributor_issue.yml

@@ -0,0 +1,70 @@
+# Assign Contributor Issue — auto-assign labeled contributor issues
+#
+# When an issue has both a `.contrib/good *` label and an `area:` label,
+# finds the least-busy contributor interested in that area (via Tally form
+# responses), assigns the issue, updates the project board, and notifies
+# the contributor on Slack.
+#
+# Errors and "no candidates" conditions are reported to the Slack activity
+# channel.
+
+name: Assign Contributor Issue
+
+on:
+  issues:
+    types: [labeled]
+  workflow_dispatch:
+    inputs:
+      issue_number:
+        description: "Issue number to test against"
+        required: true
+        type: number
+
+permissions:
+  contents: read
+
+concurrency:
+  group: assign-contributor-${{ github.event.issue.number || inputs.issue_number }}
+  cancel-in-progress: true
+
+jobs:
+  assign-contributor:
+    if: >-
+      github.event_name == 'workflow_dispatch' ||
+      (github.repository == 'zed-industries/zed' &&
+      github.event.issue.state == 'open' &&
+      (startsWith(github.event.label.name, '.contrib/good ') || startsWith(github.event.label.name, 'area:')))
+    runs-on: namespace-profile-2x4-ubuntu-2404
+    timeout-minutes: 5
+
+    steps:
+      - name: Generate app token
+        id: app-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.ZED_COMMUNITY_BOT_APP_ID }}
+          private-key: ${{ secrets.ZED_COMMUNITY_BOT_PRIVATE_KEY }}
+          owner: zed-industries
+
+      - name: Checkout repository
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        with:
+          sparse-checkout: script/github-assign-contributor-issue.py
+          sparse-checkout-cone-mode: false
+
+      - name: Set up Python
+        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install requests
+
+      - name: Assign contributor
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
+          TALLY_API_KEY: ${{ secrets.TALLY_API_KEY }}
+          TALLY_FORM_ID: ${{ vars.TALLY_CONTRIBUTOR_FORM_ID }}
+          SLACK_BOT_TOKEN: ${{ secrets.SLACK_CONTRIBUTOR_BOT_TOKEN }}
+          ISSUE_NUMBER: ${{ github.event.issue.number || inputs.issue_number }}
+        run: python script/github-assign-contributor-issue.py "$ISSUE_NUMBER"

.github/workflows/autofix_pr.yml

@@ -16,6 +16,9 @@ on:
 jobs:
   run_autofix:
     runs-on: namespace-profile-16x32-ubuntu-2204
+    env:
+      CC: clang
+      CXX: clang++
     steps:
     - name: steps::checkout_repo
       uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
@@ -50,13 +53,13 @@ jobs:
         tool: cargo-machete@0.7.0
     - name: autofix_pr::run_autofix::run_cargo_fix
       if: ${{ inputs.run_clippy }}
-      run: cargo fix --workspace --release --all-targets --all-features --allow-dirty --allow-staged
+      run: cargo fix --workspace --allow-dirty --allow-staged
     - name: autofix_pr::run_autofix::run_cargo_machete_fix
       if: ${{ inputs.run_clippy }}
       run: cargo machete --fix
     - name: autofix_pr::run_autofix::run_clippy_fix
       if: ${{ inputs.run_clippy }}
-      run: cargo clippy --workspace --release --all-targets --all-features --fix --allow-dirty --allow-staged
+      run: cargo clippy --workspace --fix --allow-dirty --allow-staged
     - name: autofix_pr::run_autofix::run_prettier_fix
       run: ./script/prettier --write
     - name: autofix_pr::run_autofix::run_cargo_fmt

.github/workflows/bump_patch_version.yml

@@ -50,16 +50,6 @@ jobs:
             echo "version=$version"
             echo "tag_suffix=$tag_suffix"
         } >> "$GITHUB_OUTPUT"
-    - name: bump_patch_version::run_bump_patch_version::verify_prior_release_exists
-      run: |
-        status=$(curl -s -o /dev/null -w '%{http_code}' "https://cloud.zed.dev/releases/$CHANNEL/$VERSION/asset?asset=zed&os=macos&arch=aarch64")
-        if [[ "$status" != "200" ]]; then
-            echo "::error::version $VERSION has not been released on $CHANNEL yet (HTTP $status) — bump the patch version only after the current version is released"
-            exit 1
-        fi
-      env:
-        CHANNEL: ${{ steps.channel.outputs.channel }}
-        VERSION: ${{ steps.channel.outputs.version }}
     - name: steps::install_cargo_edit
       uses: taiki-e/install-action@02cc5f8ca9f2301050c0c099055816a41ee05507
       with: