From b34ab6f3a1c107e3d5e4136bea12d3e910bcd95b Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Fri, 10 May 2024 14:33:53 -0400 Subject: [PATCH] Remove references to submodules (#11673) This PR removes the references to initializing Git submodules as part of building Zed. These are no longer needed, as our only submodule was removed in #11672. Release Notes: - N/A --- .github/workflows/ci.yml | 6 ------ .github/workflows/deploy_collab.yml | 3 --- .github/workflows/publish_extension_cli.yml | 1 - .github/workflows/randomized_tests.yml | 1 - .github/workflows/release_nightly.yml | 4 ---- docs/src/development/linux.md | 6 +----- docs/src/development/macos.md | 6 +----- docs/src/development/windows.md | 6 +----- script/linux | 3 --- 9 files changed, 3 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d6ebb4c613..35d764afb9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" fetch-depth: 0 - name: Remove untracked files @@ -87,7 +86,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: cargo clippy run: cargo xtask clippy @@ -115,7 +113,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: cargo clippy run: cargo xtask clippy @@ -132,7 +129,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Cache dependencies uses: swatinem/rust-cache@v2 @@ -175,7 +171,6 @@ jobs: # 25 was chosen arbitrarily. fetch-depth: 25 clean: false - submodules: "recursive" - name: Limit target directory size run: script/clear-target-dir-if-larger-than 100 @@ -273,7 +268,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Limit target directory size run: script/clear-target-dir-if-larger-than 100 diff --git a/.github/workflows/deploy_collab.yml b/.github/workflows/deploy_collab.yml index e0783d0825..e6f741bcb1 100644 --- a/.github/workflows/deploy_collab.yml +++ b/.github/workflows/deploy_collab.yml @@ -21,7 +21,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" fetch-depth: 0 - name: Run style checks @@ -41,7 +40,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" fetch-depth: 0 - name: Install cargo nextest @@ -76,7 +74,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Build docker image run: docker build . --build-arg GITHUB_SHA=$GITHUB_SHA --tag registry.digitalocean.com/zed/collab:$GITHUB_SHA diff --git a/.github/workflows/publish_extension_cli.yml b/.github/workflows/publish_extension_cli.yml index a63be647ca..7dd75e92ef 100644 --- a/.github/workflows/publish_extension_cli.yml +++ b/.github/workflows/publish_extension_cli.yml @@ -19,7 +19,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Cache dependencies uses: swatinem/rust-cache@v2 diff --git a/.github/workflows/randomized_tests.yml b/.github/workflows/randomized_tests.yml index 701b65ce07..54d794532f 100644 --- a/.github/workflows/randomized_tests.yml +++ b/.github/workflows/randomized_tests.yml @@ -31,7 +31,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Run randomized tests run: script/randomized-test-ci diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 2001138a5f..cd31885ca0 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -25,7 +25,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" fetch-depth: 0 - name: Run style checks @@ -45,7 +44,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Run tests uses: ./.github/actions/run_tests @@ -75,7 +73,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Set release channel to nightly run: | @@ -109,7 +106,6 @@ jobs: uses: actions/checkout@v4 with: clean: false - submodules: "recursive" - name: Add Rust to the PATH run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH diff --git a/docs/src/development/linux.md b/docs/src/development/linux.md index 054efc7a89..e96d5e0c16 100644 --- a/docs/src/development/linux.md +++ b/docs/src/development/linux.md @@ -2,11 +2,7 @@ ## Repository -After cloning the repository, ensure all git submodules are initialized: - -```shell -git submodule update --init --recursive -``` +Clone down the [Zed repository](https://github.com/zed-industries/zed). ## Dependencies diff --git a/docs/src/development/macos.md b/docs/src/development/macos.md index ea3a981e26..3120607f28 100644 --- a/docs/src/development/macos.md +++ b/docs/src/development/macos.md @@ -2,11 +2,7 @@ ## Repository -After cloning the repository, ensure all git submodules are initialized: - -```shell -git submodule update --init --recursive -``` +Clone down the [Zed repository](https://github.com/zed-industries/zed). ## Dependencies diff --git a/docs/src/development/windows.md b/docs/src/development/windows.md index 9fbc43ea01..9b7bddfbe6 100644 --- a/docs/src/development/windows.md +++ b/docs/src/development/windows.md @@ -5,11 +5,7 @@ ## Repository -After cloning the repository, ensure all git submodules are initialized: - -```shell -git submodule update --init --recursive -``` +Clone down the [Zed repository](https://github.com/zed-industries/zed). ## Dependencies diff --git a/script/linux b/script/linux index 4ab3252c46..0620ffe7f4 100755 --- a/script/linux +++ b/script/linux @@ -2,9 +2,6 @@ set -ex -# Install our submodule dependencies -git submodule update --init --recursive - # install the wasm toolchain which rustup > /dev/null 2>&1 || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y