diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62996c9fb4..d6ebb4c613 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,23 +104,19 @@ jobs: # todo(linux): Actually run the tests linux_tests: name: (Linux) Run Clippy and tests - runs-on: ubuntu-latest + runs-on: + - self-hosted + - deploy steps: + - name: Add Rust to the PATH + run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH + - name: Checkout repo uses: actions/checkout@v4 with: clean: false submodules: "recursive" - - name: Cache dependencies - uses: swatinem/rust-cache@v2 - with: - save-if: ${{ github.ref == 'refs/heads/main' }} - - - name: configure linux - shell: bash -euxo pipefail {0} - run: script/linux - - name: cargo clippy run: cargo xtask clippy @@ -262,26 +258,25 @@ jobs: bundle-linux: name: Create a Linux bundle - runs-on: ubuntu-22.04 # keep the version fixed to avoid libc and dynamic linked library issues + runs-on: + - self-hosted + - deploy if: ${{ startsWith(github.ref, 'refs/tags/v') || contains(github.event.pull_request.labels.*.name, 'run-bundling') }} needs: [linux_tests] env: ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }} steps: + - name: Add Rust to the PATH + run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH + - name: Checkout repo uses: actions/checkout@v4 with: clean: false submodules: "recursive" - - name: Cache dependencies - uses: swatinem/rust-cache@v2 - with: - save-if: ${{ github.ref == 'refs/heads/main' }} - - - name: Configure linux - shell: bash -euxo pipefail {0} - run: script/linux + - name: Limit target directory size + run: script/clear-target-dir-if-larger-than 100 - name: Determine version and release channel if: ${{ startsWith(github.ref, 'refs/tags/v') }} diff --git a/.github/workflows/release_nightly.yml b/.github/workflows/release_nightly.yml index 875a21aa0f..2001138a5f 100644 --- a/.github/workflows/release_nightly.yml +++ b/.github/workflows/release_nightly.yml @@ -96,7 +96,9 @@ jobs: bundle-deb: name: Create a Linux *.tar.gz bundle if: github.repository_owner == 'zed-industries' - runs-on: ubuntu-22.04 # keep the version fixed to avoid libc and dynamic linked library issues + runs-on: + - self-hosted + - deploy needs: tests env: DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }} @@ -109,14 +111,8 @@ jobs: clean: false submodules: "recursive" - - name: Cache dependencies - uses: swatinem/rust-cache@v2 - with: - save-if: ${{ github.ref == 'refs/heads/main' }} - - - name: Configure linux - shell: bash -euxo pipefail {0} - run: script/linux + - name: Add Rust to the PATH + run: echo "$HOME/.cargo/bin" >> $GITHUB_PATH - name: Set release channel to nightly run: | diff --git a/crates/zed/resources/app-icon-dev.png b/crates/zed/resources/app-icon-dev.png new file mode 100644 index 0000000000..b76e578858 Binary files /dev/null and b/crates/zed/resources/app-icon-dev.png differ diff --git a/crates/zed/resources/app-icon-dev@2x.png b/crates/zed/resources/app-icon-dev@2x.png new file mode 100644 index 0000000000..6e08503927 Binary files /dev/null and b/crates/zed/resources/app-icon-dev@2x.png differ diff --git a/script/linux b/script/linux index 135708f59f..4ab3252c46 100755 --- a/script/linux +++ b/script/linux @@ -1,12 +1,12 @@ -#!/usr/bin/bash +#!/usr/bin/env bash -set -e +set -ex # Install our submodule dependencies git submodule update --init --recursive # install the wasm toolchain -rustup target add wasm32-wasi +which rustup > /dev/null 2>&1 || curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y # if sudo is not installed, define an empty alias maysudo=$(command -v sudo || command -v doas || true)