Merge branch 'main' into debugger

zed-industries · Jul 5, 2024 · 3f8581a · 3f8581a
2 parents 00c5b83 + 9b7bc04
commit 3f8581a
Show file tree

Hide file tree

Showing 140 changed files with 5,203 additions and 2,622 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -402,7 +402,7 @@ jobs:
 
       - name: Upload app bundle to release
         uses: softprops/action-gh-release@v1
-        if: ${{ env.RELEASE_CHANNEL == 'preview' }}
+        if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
         with:
           draft: true
           prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -142,6 +142,7 @@ members = [
     "extensions/snippets",
     "extensions/svelte",
     "extensions/terraform",
+    "extensions/test-extension",
     "extensions/toml",
     "extensions/uiua",
     "extensions/vue",