From 395053bde7d08f650534dd0de40d325c82f81486 Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:02:57 +0100 Subject: [PATCH 1/7] Add new extension CI/CD --- .github/workflows/bump_version.yml | 48 +++++++++++++++++++++++ .github/workflows/ci.yml | 13 ------- .github/workflows/release.yml | 55 --------------------------- .github/workflows/release_version.yml | 13 +++++++ .github/workflows/run_tests.yml | 13 +++++++ 5 files changed, 74 insertions(+), 68 deletions(-) create mode 100644 .github/workflows/bump_version.yml delete mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/release.yml create mode 100644 .github/workflows/release_version.yml create mode 100644 .github/workflows/run_tests.yml diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml new file mode 100644 index 0000000..a272782 --- /dev/null +++ b/.github/workflows/bump_version.yml @@ -0,0 +1,48 @@ +# Generated from xtask::workflows:: within the Zed repository.extensions::bump_version +# Rebuild with `cargo xtask workflows`. +name: extensions::bump_version +on: + pull_request: + types: + - labeled + push: + branches: + - main +jobs: + determine_bump_type: + runs-on: namespace-profile-16x32-ubuntu-2204 + steps: + - id: get-bump-type + name: extensions::bump_version::get_bump_type + run: | + if [ "$HAS_MAJOR_LABEL" = "true" ]; then + bump_type="major" + elif [ "$HAS_MINOR_LABEL" = "true" ]; then + bump_type="minor" + else + bump_type="patch" + fi + echo "bump_type=$bump_type" >> $GITHUB_OUTPUT + shell: bash -euxo pipefail {0} + env: + HAS_MAJOR_LABEL: |- + ${{ (github.event.action == 'labeled' && github.event.label.name == 'major') || + (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'major')) }} + HAS_MINOR_LABEL: |- + ${{ (github.event.action == 'labeled' && github.event.label.name == 'minor') || + (github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'minor')) }} + outputs: + bump_type: ${{ steps.get-bump-type.outputs.bump_type }} + call_bump_version: + needs: + - determine_bump_type + if: |- + (github.event.action == 'labeled' && needs.determine_bump_type.outputs.bump_type != 'patch') || + github.event_name == 'push' + uses: zed-industries/zed/.github/workflows/extension_bump.yml@main + secrets: + app-id: ${{ secrets.ZED_ZIPPY_APP_ID }} + app-secret: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }} + with: + bump-type: ${{ needs.determine_bump_type.outputs.bump_type }} + force-bump: true diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index cd444bf..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: run_tests -on: - pull_request: - branches: - - "**" - push: - branches: - - main -jobs: - run-extension-tests: - uses: zed-industries/zed/.github/workflows/extension_tests.yml@main - with: - run_tests: true diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index a280c1d..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Bump Extension Version - -on: - workflow_dispatch: - inputs: - version_bump: - description: "Version bump type" - required: true - type: choice - options: - - patch - - minor - - major - -permissions: - contents: write - pull-requests: write - -jobs: - bump_version: - if: github.repository_owner == 'zed-extensions' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: main - - - name: Install bump2version - run: pip install bump2version - - - name: Bump version - id: bump_version - run: | - OLD_VERSION="$(cat Cargo.toml| sed -n 's/version = \"\(.*\)\"/\1/p')" - bump2version --verbose ${{ github.event.inputs.version_bump }} --current-version "$OLD_VERSION" Cargo.toml extension.toml - NEW_VERSION="$(cat Cargo.toml| sed -n 's/version = \"\(.*\)\"/\1/p')" - - export GIT_COMMITTER_NAME="Zed Zippy" - export GIT_COMMITTER_EMAIL="hi@zed.dev" - git commit -am "Bump to $output for @$GITHUB_ACTOR" --author "Zed Zippy " - git push origin HEAD:v${NEW_VERSION} - echo "new_version=${NEW_VERSION}" >> $GITHUB_OUTPUT - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v6 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "Bump to v${{ steps.bump_cargo.outputs.new_version }}" - title: "Bump version to ${{ steps.bump_cargo.outputs.new_version }}" - body: | - Bump to v${{ steps.bump_cargo.outputs.new_version }} - branch: v${{ steps.bump_cargo.outputs.new_version }} - base: main - delete-branch: true diff --git a/.github/workflows/release_version.yml b/.github/workflows/release_version.yml new file mode 100644 index 0000000..8975ad8 --- /dev/null +++ b/.github/workflows/release_version.yml @@ -0,0 +1,13 @@ +# Generated from xtask::workflows:: within the Zed repository.extensions::release_version +# Rebuild with `cargo xtask workflows`. +name: extensions::release_version +on: + push: + tags: + - v** +jobs: + call_release_version: + uses: zed-industries/zed/.github/workflows/extension_release.yml@main + secrets: + app-id: ${{ secrets.ZED_ZIPPY_APP_ID }} + app-secret: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }} diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml new file mode 100644 index 0000000..01834bb --- /dev/null +++ b/.github/workflows/run_tests.yml @@ -0,0 +1,13 @@ +# Generated from xtask::workflows:: within the Zed repository.extensions::run_tests +# Rebuild with `cargo xtask workflows`. +name: extensions::run_tests +on: + pull_request: + branches: + - '**' +jobs: + call_extension_tests: + uses: zed-industries/zed/.github/workflows/extension_tests.yml@main +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} + cancel-in-progress: true From 1ac2f2a158d4b5c6a2d009e0c7332aef9f3d2d73 Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:07:09 +0100 Subject: [PATCH 2/7] Fix disclaimer --- .github/workflows/bump_version.yml | 2 +- .github/workflows/release_version.yml | 2 +- .github/workflows/run_tests.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index a272782..25a283d 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -1,4 +1,4 @@ -# Generated from xtask::workflows:: within the Zed repository.extensions::bump_version +# Generated from xtask::workflows::extensions::bump_version within the Zed repository. # Rebuild with `cargo xtask workflows`. name: extensions::bump_version on: diff --git a/.github/workflows/release_version.yml b/.github/workflows/release_version.yml index 8975ad8..f752931 100644 --- a/.github/workflows/release_version.yml +++ b/.github/workflows/release_version.yml @@ -1,4 +1,4 @@ -# Generated from xtask::workflows:: within the Zed repository.extensions::release_version +# Generated from xtask::workflows::extensions::release_version within the Zed repository. # Rebuild with `cargo xtask workflows`. name: extensions::release_version on: diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 01834bb..aea0321 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -1,4 +1,4 @@ -# Generated from xtask::workflows:: within the Zed repository.extensions::run_tests +# Generated from xtask::workflows::extensions::run_tests within the Zed repository. # Rebuild with `cargo xtask workflows`. name: extensions::run_tests on: From 25f2cc05ada6bed426e564cb67f5c03d8ab100dc Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:14:06 +0100 Subject: [PATCH 3/7] Add input --- .github/workflows/run_tests.yml | 4 +++- test.lua | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 test.lua diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index aea0321..0b0085a 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -4,10 +4,12 @@ name: extensions::run_tests on: pull_request: branches: - - '**' + - "**" jobs: call_extension_tests: uses: zed-industries/zed/.github/workflows/extension_tests.yml@main + with: + run-tests: false concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} cancel-in-progress: true diff --git a/test.lua b/test.lua new file mode 100644 index 0000000..a65ccbf --- /dev/null +++ b/test.lua @@ -0,0 +1,33 @@ + + +---@class Transport @parent class +---@public field name string +local transport = {} + +function transport:move()end + +---@class Car : Transport @Car extends Transport +local car = {} +function car:move()end + +---@class Ship : Transport @Ship extends Transport +local ship = {} + +---@param type number @parameter type +---@return Car|Ship @may return Car or Ship +local function create(type) +-- ignored +end + +local obj = create(1) +---now you can see completion for obj + +---@type Car +local obj2 +---now you can see completion for obj2 + +local list = { obj, obj2 } +---@param v Transport +for _, v in ipairs(list) do +---not you can see completion for v +end From 9f4ce92ec4bf911388aca155f01f0e799b1e3fd0 Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:14:44 +0100 Subject: [PATCH 4/7] Fix inputs --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 0b0085a..b0207da 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -9,7 +9,7 @@ jobs: call_extension_tests: uses: zed-industries/zed/.github/workflows/extension_tests.yml@main with: - run-tests: false + run_tests: false concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} cancel-in-progress: true From 389ee139bfa682078e6e01fecba2ed2069f6513b Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:48:29 +0100 Subject: [PATCH 5/7] Fix concurrency groups --- .github/workflows/bump_version.yml | 3 +++ .github/workflows/run_tests.yml | 6 ++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/bump_version.yml b/.github/workflows/bump_version.yml index 25a283d..8e79c28 100644 --- a/.github/workflows/bump_version.yml +++ b/.github/workflows/bump_version.yml @@ -46,3 +46,6 @@ jobs: with: bump-type: ${{ needs.determine_bump_type.outputs.bump_type }} force-bump: true +concurrency: + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anyshalabels' }} + cancel-in-progress: true diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index b0207da..b7b0c66 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -4,12 +4,10 @@ name: extensions::run_tests on: pull_request: branches: - - "**" + - '**' jobs: call_extension_tests: uses: zed-industries/zed/.github/workflows/extension_tests.yml@main - with: - run_tests: false concurrency: - group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }} + group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anyshapr' }} cancel-in-progress: true From 6304da5f26006fa3d74c0105ec073e803abb1f3b Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 19:57:37 +0100 Subject: [PATCH 6/7] Add missing input --- .github/workflows/run_tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index b7b0c66..239b1d6 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -4,10 +4,12 @@ name: extensions::run_tests on: pull_request: branches: - - '**' + - "**" jobs: call_extension_tests: uses: zed-industries/zed/.github/workflows/extension_tests.yml@main + with: + run_tests: false concurrency: group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anyshapr' }} cancel-in-progress: true From 6ca236c6a3c43e015332d81c1477b474089521ec Mon Sep 17 00:00:00 2001 From: MrSubidubi Date: Mon, 1 Dec 2025 20:02:29 +0100 Subject: [PATCH 7/7] Remove test file --- test.lua | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 test.lua diff --git a/test.lua b/test.lua deleted file mode 100644 index a65ccbf..0000000 --- a/test.lua +++ /dev/null @@ -1,33 +0,0 @@ - - ----@class Transport @parent class ----@public field name string -local transport = {} - -function transport:move()end - ----@class Car : Transport @Car extends Transport -local car = {} -function car:move()end - ----@class Ship : Transport @Ship extends Transport -local ship = {} - ----@param type number @parameter type ----@return Car|Ship @may return Car or Ship -local function create(type) --- ignored -end - -local obj = create(1) ----now you can see completion for obj - ----@type Car -local obj2 ----now you can see completion for obj2 - -local list = { obj, obj2 } ----@param v Transport -for _, v in ipairs(list) do ----not you can see completion for v -end