Detailed changes
@@ -1,842 +0,0 @@
-name: CI
-
-on:
- push:
- tags:
- - "v*"
- - "!v00.00.00-test" # todo! remove
-
-concurrency:
- # Allow only one workflow per any non-`main` branch.
- group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
- cancel-in-progress: true
-
-env:
- CARGO_TERM_COLOR: always
- CARGO_INCREMENTAL: 0
- RUST_BACKTRACE: 1
- DIGITALOCEAN_SPACES_ACCESS_KEY: ${{ secrets.DIGITALOCEAN_SPACES_ACCESS_KEY }}
- DIGITALOCEAN_SPACES_SECRET_KEY: ${{ secrets.DIGITALOCEAN_SPACES_SECRET_KEY }}
- ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
- ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
-
-jobs:
- job_spec:
- name: Decide which jobs to run
- if: github.repository_owner == 'zed-industries'
- outputs:
- run_tests: ${{ steps.filter.outputs.run_tests }}
- run_license: ${{ steps.filter.outputs.run_license }}
- run_docs: ${{ steps.filter.outputs.run_docs }}
- run_nix: ${{ steps.filter.outputs.run_nix }}
- run_actionlint: ${{ steps.filter.outputs.run_actionlint }}
- runs-on:
- - namespace-profile-2x4-ubuntu-2404
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- # 350 is arbitrary; ~10days of history on main (5secs); full history is ~25secs
- fetch-depth: ${{ github.ref == 'refs/heads/main' && 2 || 350 }}
- - name: Fetch git history and generate output filters
- id: filter
- run: |
- if [ -z "$GITHUB_BASE_REF" ]; then
- echo "Not in a PR context (i.e., push to main/stable/preview)"
- COMPARE_REV="$(git rev-parse HEAD~1)"
- else
- echo "In a PR context comparing to pull_request.base.ref"
- git fetch origin "$GITHUB_BASE_REF" --depth=350
- COMPARE_REV="$(git merge-base "origin/${GITHUB_BASE_REF}" HEAD)"
- fi
- CHANGED_FILES="$(git diff --name-only "$COMPARE_REV" ${{ github.sha }})"
-
- # Specify anything which should potentially skip full test suite in this regex:
- # - docs/
- # - script/update_top_ranking_issues/
- # - .github/ISSUE_TEMPLATE/
- # - .github/workflows/ (except .github/workflows/ci.yml)
- SKIP_REGEX='^(docs/|script/update_top_ranking_issues/|\.github/(ISSUE_TEMPLATE|workflows/(?!ci)))'
-
- echo "$CHANGED_FILES" | grep -qvP "$SKIP_REGEX" && \
- echo "run_tests=true" >> "$GITHUB_OUTPUT" || \
- echo "run_tests=false" >> "$GITHUB_OUTPUT"
-
- echo "$CHANGED_FILES" | grep -qP '^docs/' && \
- echo "run_docs=true" >> "$GITHUB_OUTPUT" || \
- echo "run_docs=false" >> "$GITHUB_OUTPUT"
-
- echo "$CHANGED_FILES" | grep -qP '^\.github/(workflows/|actions/|actionlint.yml)' && \
- echo "run_actionlint=true" >> "$GITHUB_OUTPUT" || \
- echo "run_actionlint=false" >> "$GITHUB_OUTPUT"
-
- echo "$CHANGED_FILES" | grep -qP '^(Cargo.lock|script/.*licenses)' && \
- echo "run_license=true" >> "$GITHUB_OUTPUT" || \
- echo "run_license=false" >> "$GITHUB_OUTPUT"
-
- echo "$CHANGED_FILES" | grep -qP '^(nix/|flake\.|Cargo\.|rust-toolchain.toml|\.cargo/config.toml)' && \
- echo "$GITHUB_REF_NAME" | grep -qvP '^v[0-9]+\.[0-9]+\.[0-9x](-pre)?$' && \
- echo "run_nix=true" >> "$GITHUB_OUTPUT" || \
- echo "run_nix=false" >> "$GITHUB_OUTPUT"
-
- migration_checks:
- name: Check Postgres and Protobuf migrations, mergability
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- timeout-minutes: 60
- runs-on:
- - self-mini-macos
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
- fetch-depth: 0 # fetch full history
-
- - name: Remove untracked files
- run: git clean -df
-
- - name: Find modified migrations
- shell: bash -euxo pipefail {0}
- run: |
- export SQUAWK_GITHUB_TOKEN=${{ github.token }}
- . ./script/squawk
-
- - name: Ensure fresh merge
- shell: bash -euxo pipefail {0}
- run: |
- if [ -z "$GITHUB_BASE_REF" ];
- then
- echo "BUF_BASE_BRANCH=$(git merge-base origin/main HEAD)" >> "$GITHUB_ENV"
- else
- git checkout -B temp
- git merge -q "origin/$GITHUB_BASE_REF" -m "merge main into temp"
- echo "BUF_BASE_BRANCH=$GITHUB_BASE_REF" >> "$GITHUB_ENV"
- fi
-
- - uses: bufbuild/buf-setup-action@v1
- with:
- version: v1.29.0
- - uses: bufbuild/buf-breaking-action@v1
- with:
- input: "crates/proto/proto/"
- against: "https://github.com/${GITHUB_REPOSITORY}.git#branch=${BUF_BASE_BRANCH},subdir=crates/proto/proto/"
-
- style:
- timeout-minutes: 60
- name: Check formatting and spelling
- needs: [job_spec]
- if: github.repository_owner == 'zed-industries'
- runs-on:
- - namespace-profile-4x8-ubuntu-2204
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
-
- - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
- with:
- version: 9
-
- - name: Prettier Check on /docs
- working-directory: ./docs
- run: |
- pnpm dlx "prettier@${PRETTIER_VERSION}" . --check || {
- echo "To fix, run from the root of the Zed repo:"
- echo " cd docs && pnpm dlx prettier@${PRETTIER_VERSION} . --write && cd .."
- false
- }
- env:
- PRETTIER_VERSION: 3.5.0
-
- - name: Prettier Check on default.json
- run: |
- pnpm dlx "prettier@${PRETTIER_VERSION}" assets/settings/default.json --check || {
- echo "To fix, run from the root of the Zed repo:"
- echo " pnpm dlx prettier@${PRETTIER_VERSION} assets/settings/default.json --write"
- false
- }
- env:
- PRETTIER_VERSION: 3.5.0
-
- # To support writing comments that they will certainly be revisited.
- - name: Check for todo! and FIXME comments
- run: script/check-todos
-
- - name: Check modifier use in keymaps
- run: script/check-keymaps
-
- - name: Run style checks
- uses: ./.github/actions/check_style
-
- - name: Check for typos
- uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1.38.1
- with:
- config: ./typos.toml
-
- check_docs:
- timeout-minutes: 60
- name: Check docs
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- (needs.job_spec.outputs.run_tests == 'true' || needs.job_spec.outputs.run_docs == 'true')
- runs-on:
- - namespace-profile-8x16-ubuntu-2204
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Configure CI
- run: |
- mkdir -p ./../.cargo
- cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
- - name: Build docs
- uses: ./.github/actions/build_docs
-
- actionlint:
- runs-on: namespace-profile-2x4-ubuntu-2404
- if: github.repository_owner == 'zed-industries' && needs.job_spec.outputs.run_actionlint == 'true'
- needs: [job_spec]
- steps:
- - uses: actions/checkout@v4
- - name: Download actionlint
- id: get_actionlint
- run: bash <(curl https://raw.githubusercontent.com/rhysd/actionlint/main/scripts/download-actionlint.bash)
- shell: bash
- - name: Check workflow files
- run: ${{ steps.get_actionlint.outputs.executable }} -color
- shell: bash
-
- macos_tests:
- timeout-minutes: 60
- name: (macOS) Run Clippy and tests
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- runs-on:
- - self-mini-macos
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Configure CI
- run: |
- mkdir -p ./../.cargo
- cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
- - name: Check that Cargo.lock is up to date
- run: |
- cargo update --locked --workspace
-
- - name: cargo clippy
- run: ./script/clippy
-
- - name: Install cargo-machete
- uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
- with:
- command: install
- args: cargo-machete@0.7.0
-
- - name: Check unused dependencies
- uses: clechasseur/rs-cargo@8435b10f6e71c2e3d4d3b7573003a8ce4bfc6386 # v2
- with:
- command: machete
-
- - name: Check licenses
- run: |
- script/check-licenses
- if [[ "${{ needs.job_spec.outputs.run_license }}" == "true" ]]; then
- script/generate-licenses /tmp/zed_licenses_output
- fi
-
- - name: Check for new vulnerable dependencies
- if: github.event_name == 'pull_request'
- uses: actions/dependency-review-action@67d4f4bd7a9b17a0db54d2a7519187c65e339de8 # v4
- with:
- license-check: false
-
- - name: Run tests
- uses: ./.github/actions/run_tests
-
- - name: Build collab
- # we should do this on a linux x86 machinge
- run: cargo build -p collab
-
- - name: Build other binaries and features
- run: |
- cargo build --workspace --bins --examples
-
- # Since the macOS runners are stateful, so we need to remove the config file to prevent potential bug.
- - name: Clean CI config file
- if: always()
- run: rm -rf ./../.cargo
-
- linux_tests:
- timeout-minutes: 60
- name: (Linux) Run Clippy and tests
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- runs-on:
- - namespace-profile-16x32-ubuntu-2204
- steps:
- - name: Add Rust to the PATH
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Cache dependencies
- uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
- with:
- save-if: ${{ github.ref == 'refs/heads/main' }}
- # cache-provider: "buildjet"
-
- - name: Install Linux dependencies
- run: ./script/linux
-
- - name: Configure CI
- run: |
- mkdir -p ./../.cargo
- cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
- - name: cargo clippy
- run: ./script/clippy
-
- - name: Run tests
- uses: ./.github/actions/run_tests
-
- - name: Build other binaries and features
- run: |
- cargo build -p zed
- cargo check -p workspace
- cargo check -p gpui --examples
-
- # Even the Linux runner is not stateful, in theory there is no need to do this cleanup.
- # But, to avoid potential issues in the future if we choose to use a stateful Linux runner and forget to add code
- # to clean up the config file, I’ve included the cleanup code here as a precaution.
- # While it’s not strictly necessary at this moment, I believe it’s better to err on the side of caution.
- - name: Clean CI config file
- if: always()
- run: rm -rf ./../.cargo
-
- doctests:
- # Nextest currently doesn't support doctests, so run them separately and in parallel.
- timeout-minutes: 60
- name: (Linux) Run doctests
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- runs-on:
- - namespace-profile-16x32-ubuntu-2204
- steps:
- - name: Add Rust to the PATH
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Cache dependencies
- uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
- with:
- save-if: ${{ github.ref == 'refs/heads/main' }}
- # cache-provider: "buildjet"
-
- - name: Install Linux dependencies
- run: ./script/linux
-
- - name: Configure CI
- run: |
- mkdir -p ./../.cargo
- cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
- - name: Run doctests
- run: cargo test --workspace --doc --no-fail-fast
-
- - name: Clean CI config file
- if: always()
- run: rm -rf ./../.cargo
-
- build_remote_server:
- timeout-minutes: 60
- name: (Linux) Build Remote Server
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- runs-on:
- - namespace-profile-16x32-ubuntu-2204
- steps:
- - name: Add Rust to the PATH
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
-
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Cache dependencies
- uses: swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2
- with:
- save-if: ${{ github.ref == 'refs/heads/main' }}
- # cache-provider: "buildjet"
-
- - name: Install Clang & Mold
- run: ./script/remote-server && ./script/install-mold 2.34.0
-
- - name: Configure CI
- run: |
- mkdir -p ./../.cargo
- cp ./.cargo/ci-config.toml ./../.cargo/config.toml
-
- - name: Build Remote Server
- run: cargo build -p remote_server
-
- - name: Clean CI config file
- if: always()
- run: rm -rf ./../.cargo
-
- windows_tests:
- timeout-minutes: 60
- name: (Windows) Run Clippy and tests
- needs: [job_spec]
- if: |
- github.repository_owner == 'zed-industries' &&
- needs.job_spec.outputs.run_tests == 'true'
- runs-on: [self-32vcpu-windows-2022]
- steps:
- - name: Environment Setup
- run: |
- $RunnerDir = Split-Path -Parent $env:RUNNER_WORKSPACE
- Write-Output `
- "RUSTUP_HOME=$RunnerDir\.rustup" `
- "CARGO_HOME=$RunnerDir\.cargo" `
- "PATH=$RunnerDir\.cargo\bin;$env:PATH" `
- >> $env:GITHUB_ENV
-
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Configure CI
- run: |
- New-Item -ItemType Directory -Path "./../.cargo" -Force
- Copy-Item -Path "./.cargo/ci-config.toml" -Destination "./../.cargo/config.toml"
-
- - name: cargo clippy
- run: |
- .\script\clippy.ps1
-
- - name: Run tests
- uses: ./.github/actions/run_tests_windows
-
- - name: Build Zed
- run: cargo build
-
- - name: Limit target directory size
- run: ./script/clear-target-dir-if-larger-than.ps1 250
-
- - name: Clean CI config file
- if: always()
- run: Remove-Item -Recurse -Path "./../.cargo" -Force -ErrorAction SilentlyContinue
-
- tests_pass:
- name: Tests Pass
- runs-on: namespace-profile-2x4-ubuntu-2404
- needs:
- - job_spec
- - style
- - check_docs
- - actionlint
- - migration_checks
- # run_tests: If adding required tests, add them here and to script below.
- - linux_tests
- - build_remote_server
- - macos_tests
- - windows_tests
- if: |
- github.repository_owner == 'zed-industries' &&
- always()
- steps:
- - name: Check all tests passed
- run: |
- # Check dependent jobs...
- RET_CODE=0
- # Always check style
- [[ "${{ needs.style.result }}" != 'success' ]] && { RET_CODE=1; echo "style tests failed"; }
-
- if [[ "${{ needs.job_spec.outputs.run_docs }}" == "true" ]]; then
- [[ "${{ needs.check_docs.result }}" != 'success' ]] && { RET_CODE=1; echo "docs checks failed"; }
- fi
-
- if [[ "${{ needs.job_spec.outputs.run_actionlint }}" == "true" ]]; then
- [[ "${{ needs.actionlint.result }}" != 'success' ]] && { RET_CODE=1; echo "actionlint checks failed"; }
- fi
-
- # Only check test jobs if they were supposed to run
- if [[ "${{ needs.job_spec.outputs.run_tests }}" == "true" ]]; then
- [[ "${{ needs.macos_tests.result }}" != 'success' ]] && { RET_CODE=1; echo "macOS tests failed"; }
- [[ "${{ needs.linux_tests.result }}" != 'success' ]] && { RET_CODE=1; echo "Linux tests failed"; }
- [[ "${{ needs.windows_tests.result }}" != 'success' ]] && { RET_CODE=1; echo "Windows tests failed"; }
- [[ "${{ needs.build_remote_server.result }}" != 'success' ]] && { RET_CODE=1; echo "Remote server build failed"; }
- # This check is intentionally disabled. See: https://github.com/zed-industries/zed/pull/28431
- # [[ "${{ needs.migration_checks.result }}" != 'success' ]] && { RET_CODE=1; echo "Migration Checks failed"; }
- fi
- if [[ "$RET_CODE" -eq 0 ]]; then
- echo "All tests passed successfully!"
- fi
- exit $RET_CODE
-
- bundle-mac:
- timeout-minutes: 120
- name: Create a macOS bundle
- runs-on:
- - self-mini-macos
- if: startsWith(github.ref, 'refs/tags/v')
- needs: [macos_tests]
- env:
- MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
- MACOS_CERTIFICATE_PASSWORD: ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
- APPLE_NOTARIZATION_KEY: ${{ secrets.APPLE_NOTARIZATION_KEY }}
- APPLE_NOTARIZATION_KEY_ID: ${{ secrets.APPLE_NOTARIZATION_KEY_ID }}
- APPLE_NOTARIZATION_ISSUER_ID: ${{ secrets.APPLE_NOTARIZATION_ISSUER_ID }}
- steps:
- - name: Install Node
- uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
- with:
- node-version: "18"
-
- - name: Setup Sentry CLI
- uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
- with:
- token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- # We need to fetch more than one commit so that `script/draft-release-notes`
- # is able to diff between the current and previous tag.
- #
- # 25 was chosen arbitrarily.
- fetch-depth: 25
- clean: false
- ref: ${{ github.ref }}
-
- - name: Limit target directory size
- run: script/clear-target-dir-if-larger-than 300
-
- - name: Determine version and release channel
- run: |
- # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
- script/determine-release-channel
-
- - name: Draft release notes
- run: |
- mkdir -p target/
- # Ignore any errors that occur while drafting release notes to not fail the build.
- script/draft-release-notes "$RELEASE_VERSION" "$RELEASE_CHANNEL" > target/release-notes.md || true
- script/create-draft-release target/release-notes.md
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Create macOS app bundle (aarch64)
- run: script/bundle-mac aarch64-apple-darwin
-
- - name: Create macOS app bundle (x64)
- run: script/bundle-mac x86_64-apple-darwin
-
- - name: Rename binaries
- run: |
- mv target/aarch64-apple-darwin/release/Zed.dmg target/aarch64-apple-darwin/release/Zed-aarch64.dmg
- mv target/x86_64-apple-darwin/release/Zed.dmg target/x86_64-apple-darwin/release/Zed-x86_64.dmg
-
- - uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- name: Upload app bundle to release
- if: ${{ env.RELEASE_CHANNEL == 'preview' || env.RELEASE_CHANNEL == 'stable' }}
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: |
- target/zed-remote-server-macos-x86_64.gz
- target/zed-remote-server-macos-aarch64.gz
- target/aarch64-apple-darwin/release/Zed-aarch64.dmg
- target/x86_64-apple-darwin/release/Zed-x86_64.dmg
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- bundle-linux-x86_x64:
- timeout-minutes: 60
- name: Linux x86_x64 release bundle
- runs-on:
- - namespace-profile-16x32-ubuntu-2004 # ubuntu 20.04 for minimal glibc
- if: |
- ( startsWith(github.ref, 'refs/tags/v') )
- needs: [linux_tests]
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Install Linux dependencies
- run: ./script/linux && ./script/install-mold 2.34.0
-
- - name: Setup Sentry CLI
- uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
- with:
- token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
- - name: Determine version and release channel
- run: |
- # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
- script/determine-release-channel
-
- - name: Create Linux .tar.gz bundle
- run: script/bundle-linux
-
- - name: Upload Artifacts to release
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: |
- target/zed-remote-server-linux-x86_64.gz
- target/release/zed-linux-x86_64.tar.gz
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- bundle-linux-aarch64: # this runs on ubuntu22.04
- timeout-minutes: 60
- name: Linux arm64 release bundle
- runs-on:
- - namespace-profile-8x32-ubuntu-2004-arm-m4 # ubuntu 20.04 for minimal glibc
- if: |
- startsWith(github.ref, 'refs/tags/v')
- needs: [linux_tests]
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Install Linux dependencies
- run: ./script/linux
-
- - name: Setup Sentry CLI
- uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
- with:
- token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
- - name: Determine version and release channel
- run: |
- # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
- script/determine-release-channel
-
- - name: Create and upload Linux .tar.gz bundles
- run: script/bundle-linux
-
- - name: Upload Artifacts to release
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: |
- target/zed-remote-server-linux-aarch64.gz
- target/release/zed-linux-aarch64.tar.gz
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- freebsd:
- timeout-minutes: 60
- runs-on: github-8vcpu-ubuntu-2404
- if: |
- false && ( startsWith(github.ref, 'refs/tags/v') )
- needs: [linux_tests]
- name: Build Zed on FreeBSD
- steps:
- - uses: actions/checkout@v4
- - name: Build FreeBSD remote-server
- id: freebsd-build
- uses: vmactions/freebsd-vm@c3ae29a132c8ef1924775414107a97cac042aad5 # v1.2.0
- with:
- usesh: true
- release: 13.5
- copyback: true
- prepare: |
- pkg install -y \
- bash curl jq git \
- rustup-init cmake-core llvm-devel-lite pkgconf protobuf # ibx11 alsa-lib rust-bindgen-cli
- run: |
- freebsd-version
- sysctl hw.model
- sysctl hw.ncpu
- sysctl hw.physmem
- sysctl hw.usermem
- git config --global --add safe.directory /home/runner/work/zed/zed
- rustup-init --profile minimal --default-toolchain none -y
- . "$HOME/.cargo/env"
- ./script/bundle-freebsd
- mkdir -p out/
- mv "target/zed-remote-server-freebsd-x86_64.gz" out/
- rm -rf target/
- cargo clean
-
- - name: Upload Artifact to Workflow - zed-remote-server (run-bundling)
- uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4
- if: contains(github.event.pull_request.labels.*.name, 'run-bundling')
- with:
- name: zed-remote-server-${{ github.event.pull_request.head.sha || github.sha }}-x86_64-unknown-freebsd.gz
- path: out/zed-remote-server-freebsd-x86_64.gz
-
- - name: Upload Artifacts to release
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- if: ${{ !(contains(github.event.pull_request.labels.*.name, 'run-bundling')) }}
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: |
- out/zed-remote-server-freebsd-x86_64.gz
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- nix-build:
- name: Build with Nix
- uses: ./.github/workflows/nix_build.yml
- needs: [job_spec]
- if: github.repository_owner == 'zed-industries' &&
- (contains(github.event.pull_request.labels.*.name, 'run-nix') ||
- needs.job_spec.outputs.run_nix == 'true')
- secrets: inherit
-
- bundle-windows-x64:
- timeout-minutes: 120
- name: Create a Windows installer for x86_64
- runs-on: [self-32vcpu-windows-2022]
- if: |
- ( startsWith(github.ref, 'refs/tags/v') )
- needs: [windows_tests]
- env:
- AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
- AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
- AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
- ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
- CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
- ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
- FILE_DIGEST: SHA256
- TIMESTAMP_DIGEST: SHA256
- TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Setup Sentry CLI
- uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
- with:
- token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
- - name: Determine version and release channel
- working-directory: ${{ env.ZED_WORKSPACE }}
- run: |
- # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
- script/determine-release-channel.ps1
-
- - name: Build Zed installer
- working-directory: ${{ env.ZED_WORKSPACE }}
- run: script/bundle-windows.ps1
-
- - name: Upload Artifacts to release
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: ${{ env.SETUP_PATH }}
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- bundle-windows-aarch64:
- timeout-minutes: 120
- name: Create a Windows installer for aarch64
- runs-on: [self-32vcpu-windows-2022]
- if: |
- ( startsWith(github.ref, 'refs/tags/v') )
- needs: [windows_tests]
- env:
- AZURE_TENANT_ID: ${{ secrets.AZURE_SIGNING_TENANT_ID }}
- AZURE_CLIENT_ID: ${{ secrets.AZURE_SIGNING_CLIENT_ID }}
- AZURE_CLIENT_SECRET: ${{ secrets.AZURE_SIGNING_CLIENT_SECRET }}
- ACCOUNT_NAME: ${{ vars.AZURE_SIGNING_ACCOUNT_NAME }}
- CERT_PROFILE_NAME: ${{ vars.AZURE_SIGNING_CERT_PROFILE_NAME }}
- ENDPOINT: ${{ vars.AZURE_SIGNING_ENDPOINT }}
- FILE_DIGEST: SHA256
- TIMESTAMP_DIGEST: SHA256
- TIMESTAMP_SERVER: "http://timestamp.acs.microsoft.com"
- steps:
- - name: Checkout repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- with:
- clean: false
-
- - name: Setup Sentry CLI
- uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b #v2
- with:
- token: ${{ SECRETS.SENTRY_AUTH_TOKEN }}
-
- - name: Determine version and release channel
- working-directory: ${{ env.ZED_WORKSPACE }}
- run: |
- # This exports RELEASE_CHANNEL into env (GITHUB_ENV)
- script/determine-release-channel.ps1
-
- - name: Build Zed installer
- working-directory: ${{ env.ZED_WORKSPACE }}
- run: script/bundle-windows.ps1 -Architecture aarch64
-
- - name: Upload Artifacts to release
- uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1
- with:
- draft: true
- prerelease: ${{ env.RELEASE_CHANNEL == 'preview' }}
- files: ${{ env.SETUP_PATH }}
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- auto-release-preview:
- name: Auto release preview
- if: |
- false
- && startsWith(github.ref, 'refs/tags/v')
- && endsWith(github.ref, '-pre') && !endsWith(github.ref, '.0-pre')
- needs: [bundle-mac, bundle-linux-x86_x64, bundle-linux-aarch64, bundle-windows-x64, bundle-windows-aarch64]
- runs-on:
- - self-mini-macos
- steps:
- - name: gh release
- run: gh release edit "$GITHUB_REF_NAME" --draft=false
- env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
- - name: Create Sentry release
- uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c # v3
- env:
- SENTRY_ORG: zed-dev
- SENTRY_PROJECT: zed
- SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
- with:
- environment: production
@@ -29,10 +29,10 @@ jobs:
node-version: '20'
cache: pnpm
cache-dependency-path: script/danger/pnpm-lock.yaml
- - name: danger::install_deps
+ - name: danger::danger_job::install_deps
run: pnpm install --dir script/danger
shell: bash -euxo pipefail {0}
- - name: danger::run
+ - name: danger::danger_job::run
run: pnpm run --dir script/danger danger ci
shell: bash -euxo pipefail {0}
env:
@@ -1,97 +0,0 @@
-# Generated from xtask::workflows::nix_build
-# Rebuild with `cargo xtask workflows`.
-name: nix_build
-env:
- CARGO_TERM_COLOR: always
- RUST_BACKTRACE: '1'
- CARGO_INCREMENTAL: '0'
-on:
- pull_request:
- branches:
- - '**'
- paths:
- - nix/**
- - flake.*
- - Cargo.*
- - rust-toolchain.toml
- - .cargo/config.toml
- push:
- branches:
- - main
- - v[0-9]+.[0-9]+.x
- paths:
- - nix/**
- - flake.*
- - Cargo.*
- - rust-toolchain.toml
- - .cargo/config.toml
- workflow_call: {}
-jobs:
- build_nix_linux_x86_64:
- if: github.repository_owner == 'zed-industries'
- runs-on: namespace-profile-32x64-ubuntu-2004
- env:
- ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
- ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
- ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
- GIT_LFS_SKIP_SMUDGE: '1'
- steps:
- - name: steps::checkout_repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- with:
- clean: false
- - name: nix_build::install_nix
- uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f
- with:
- github_access_token: ${{ secrets.GITHUB_TOKEN }}
- - name: nix_build::cachix_action
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
- with:
- name: zed
- authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- cachixArgs: -v
- pushFilter: -zed-editor-[0-9.]*-nightly
- - name: nix_build::build
- run: nix build .#debug -L --accept-flake-config
- shell: bash -euxo pipefail {0}
- timeout-minutes: 60
- continue-on-error: true
- build_nix_mac_aarch64:
- if: github.repository_owner == 'zed-industries'
- runs-on: self-mini-macos
- env:
- ZED_CLIENT_CHECKSUM_SEED: ${{ secrets.ZED_CLIENT_CHECKSUM_SEED }}
- ZED_MINIDUMP_ENDPOINT: ${{ secrets.ZED_SENTRY_MINIDUMP_ENDPOINT }}
- ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON: ${{ secrets.ZED_CLOUD_PROVIDER_ADDITIONAL_MODELS_JSON }}
- GIT_LFS_SKIP_SMUDGE: '1'
- steps:
- - name: steps::checkout_repo
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
- with:
- clean: false
- - name: nix_build::set_path
- run: |
- echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
- echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
- shell: bash -euxo pipefail {0}
- - name: nix_build::cachix_action
- uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
- with:
- name: zed
- authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- cachixArgs: -v
- pushFilter: -zed-editor-[0-9.]*-nightly
- - name: nix_build::build
- run: nix build .#debug -L --accept-flake-config
- shell: bash -euxo pipefail {0}
- - name: nix_build::limit_store
- run: |-
- if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
- nix-collect-garbage -d || true
- fi
- shell: bash -euxo pipefail {0}
- timeout-minutes: 60
- continue-on-error: true
-concurrency:
- group: ${{ github.workflow }}-${{ github.ref_name }}-${{ github.ref_name == 'main' && github.sha || 'anysha' }}
- cancel-in-progress: true
@@ -465,7 +465,7 @@ jobs:
shell: bash -euxo pipefail {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: release::create_sentry_release
+ - name: release::auto_release_preview::create_sentry_release
uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c
with:
environment: production
@@ -201,9 +201,6 @@ jobs:
uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
with:
token: ${{ secrets.SENTRY_AUTH_TOKEN }}
- - name: release_nightly::add_rust_to_path
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
- shell: bash -euxo pipefail {0}
- name: ./script/linux
run: ./script/linux
shell: bash -euxo pipefail {0}
@@ -242,9 +239,6 @@ jobs:
uses: matbour/setup-sentry-cli@3e938c54b3018bdd019973689ef984e033b0454b
with:
token: ${{ secrets.SENTRY_AUTH_TOKEN }}
- - name: release_nightly::add_rust_to_path
- run: echo "$HOME/.cargo/bin" >> "$GITHUB_PATH"
- shell: bash -euxo pipefail {0}
- name: ./script/linux
run: ./script/linux
shell: bash -euxo pipefail {0}
@@ -298,11 +292,11 @@ jobs:
"nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
- - name: release_nightly::build_zed_installer
+ - name: run_bundling::bundle_windows
run: script/bundle-windows.ps1 -Architecture x86_64
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
- - name: release_nightly::upload_zed_nightly_windows
+ - name: release_nightly::upload_zed_nightly
run: script/upload-nightly.ps1 -Architecture x86_64
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
@@ -340,11 +334,11 @@ jobs:
"nightly" | Set-Content -Path "crates/zed/RELEASE_CHANNEL"
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
- - name: release_nightly::build_zed_installer
+ - name: run_bundling::bundle_windows
run: script/bundle-windows.ps1 -Architecture aarch64
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
- - name: release_nightly::upload_zed_nightly_windows
+ - name: release_nightly::upload_zed_nightly
run: script/upload-nightly.ps1 -Architecture aarch64
shell: pwsh
working-directory: ${{ env.ZED_WORKSPACE }}
@@ -365,17 +359,17 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
clean: false
- - name: nix_build::install_nix
+ - name: nix_build::build_nix::install_nix
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- - name: nix_build::cachix_action
+ - name: nix_build::build_nix::cachix_action
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
with:
name: zed
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
cachixArgs: -v
- - name: nix_build::build
+ - name: nix_build::build_nix::build
run: nix build .#default -L --accept-flake-config
shell: bash -euxo pipefail {0}
timeout-minutes: 60
@@ -396,21 +390,21 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
clean: false
- - name: nix_build::set_path
+ - name: nix_build::build_nix::set_path
run: |
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
shell: bash -euxo pipefail {0}
- - name: nix_build::cachix_action
+ - name: nix_build::build_nix::cachix_action
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
with:
name: zed
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
cachixArgs: -v
- - name: nix_build::build
+ - name: nix_build::build_nix::build
run: nix build .#default -L --accept-flake-config
shell: bash -euxo pipefail {0}
- - name: nix_build::limit_store
+ - name: nix_build::build_nix::limit_store
run: |-
if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
nix-collect-garbage -d || true
@@ -434,7 +428,7 @@ jobs:
with:
clean: false
fetch-depth: 0
- - name: release_nightly::update_nightly_tag
+ - name: release_nightly::update_nightly_tag_job::update_nightly_tag
run: |
if [ "$(git rev-parse nightly)" = "$(git rev-parse HEAD)" ]; then
echo "Nightly tag already points to current commit. Skipping tagging."
@@ -445,7 +439,7 @@ jobs:
git tag -f nightly
git push origin nightly --force
shell: bash -euxo pipefail {0}
- - name: release_nightly::create_sentry_release
+ - name: release_nightly::update_nightly_tag_job::create_sentry_release
uses: getsentry/action-release@526942b68292201ac6bbb99b9a0747d4abee354c
with:
environment: production
@@ -444,18 +444,18 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
clean: false
- - name: nix_build::install_nix
+ - name: nix_build::build_nix::install_nix
uses: cachix/install-nix-action@02a151ada4993995686f9ed4f1be7cfbb229e56f
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
- - name: nix_build::cachix_action
+ - name: nix_build::build_nix::cachix_action
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
with:
name: zed
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
cachixArgs: -v
pushFilter: -zed-editor-[0-9.]*-nightly
- - name: nix_build::build
+ - name: nix_build::build_nix::build
run: nix build .#debug -L --accept-flake-config
shell: bash -euxo pipefail {0}
timeout-minutes: 60
@@ -475,22 +475,22 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
with:
clean: false
- - name: nix_build::set_path
+ - name: nix_build::build_nix::set_path
run: |
echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
shell: bash -euxo pipefail {0}
- - name: nix_build::cachix_action
+ - name: nix_build::build_nix::cachix_action
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad
with:
name: zed
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
cachixArgs: -v
pushFilter: -zed-editor-[0-9.]*-nightly
- - name: nix_build::build
+ - name: nix_build::build_nix::build
run: nix build .#debug -L --accept-flake-config
shell: bash -euxo pipefail {0}
- - name: nix_build::limit_store
+ - name: nix_build::build_nix::limit_store
run: |-
if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
nix-collect-garbage -d || true
@@ -1,11 +1,13 @@
use gh_workflow::*;
-use crate::tasks::workflows::steps::named;
+use crate::tasks::workflows::steps::{NamedJob, named};
use super::{runners, steps};
/// Generates the danger.yml workflow
pub fn danger() -> Workflow {
+ let danger = danger_job();
+
named::workflow()
.on(
Event::default().pull_request(PullRequest::default().add_branch("main").types([
@@ -15,39 +17,43 @@ pub fn danger() -> Workflow {
PullRequestType::Edited,
])),
)
- .add_job(
- "danger",
- Job::default()
- .cond(Expression::new(
- "github.repository_owner == 'zed-industries'",
- ))
- .runs_on(runners::LINUX_SMALL)
- .add_step(steps::checkout_repo())
- .add_step(steps::setup_pnpm())
- .add_step(
- steps::setup_node()
- .add_with(("cache", "pnpm"))
- .add_with(("cache-dependency-path", "script/danger/pnpm-lock.yaml")),
- )
- .add_step(install_deps())
- .add_step(run()),
- )
+ .add_job(danger.name, danger.job)
}
-pub fn install_deps() -> Step<Run> {
- named::bash("pnpm install --dir script/danger")
-}
+fn danger_job() -> NamedJob {
+ pub fn install_deps() -> Step<Run> {
+ named::bash("pnpm install --dir script/danger")
+ }
+
+ pub fn run() -> Step<Run> {
+ named::bash("pnpm run --dir script/danger danger ci")
+ // This GitHub token is not used, but the value needs to be here to prevent
+ // Danger from throwing an error.
+ .add_env(("GITHUB_TOKEN", "not_a_real_token"))
+ // All requests are instead proxied through an instance of
+ // https://github.com/maxdeviant/danger-proxy that allows Danger to securely
+ // authenticate with GitHub while still being able to run on PRs from forks.
+ .add_env((
+ "DANGER_GITHUB_API_BASE_URL",
+ "https://danger-proxy.fly.dev/github",
+ ))
+ }
-pub fn run() -> Step<Run> {
- named::bash("pnpm run --dir script/danger danger ci")
- // This GitHub token is not used, but the value needs to be here to prevent
- // Danger from throwing an error.
- .add_env(("GITHUB_TOKEN", "not_a_real_token"))
- // All requests are instead proxied through an instance of
- // https://github.com/maxdeviant/danger-proxy that allows Danger to securely
- // authenticate with GitHub while still being able to run on PRs from forks.
- .add_env((
- "DANGER_GITHUB_API_BASE_URL",
- "https://danger-proxy.fly.dev/github",
- ))
+ NamedJob {
+ name: "danger".to_string(),
+ job: Job::default()
+ .cond(Expression::new(
+ "github.repository_owner == 'zed-industries'",
+ ))
+ .runs_on(runners::LINUX_SMALL)
+ .add_step(steps::checkout_repo())
+ .add_step(steps::setup_pnpm())
+ .add_step(
+ steps::setup_node()
+ .add_with(("cache", "pnpm"))
+ .add_with(("cache-dependency-path", "script/danger/pnpm-lock.yaml")),
+ )
+ .add_step(install_deps())
+ .add_step(run()),
+ }
}
@@ -14,6 +14,55 @@ pub(crate) fn build_nix(
cachix_filter: Option<&str>,
deps: &[&NamedJob],
) -> NamedJob {
+ // on our macs we manually install nix. for some reason the cachix action is running
+ // under a non-login /bin/bash shell which doesn't source the proper script to add the
+ // nix profile to PATH, so we manually add them here
+ pub fn set_path() -> Step<Run> {
+ named::bash(indoc! {r#"
+ echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
+ echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
+ "#})
+ }
+
+ pub fn install_nix() -> Step<Use> {
+ named::uses(
+ "cachix",
+ "install-nix-action",
+ "02a151ada4993995686f9ed4f1be7cfbb229e56f", // v31
+ )
+ .add_with(("github_access_token", vars::GITHUB_TOKEN))
+ }
+
+ pub fn cachix_action(cachix_filter: Option<&str>) -> Step<Use> {
+ let mut step = named::uses(
+ "cachix",
+ "cachix-action",
+ "0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad", // v16
+ )
+ .add_with(("name", "zed"))
+ .add_with(("authToken", vars::CACHIX_AUTH_TOKEN))
+ .add_with(("cachixArgs", "-v"));
+ if let Some(cachix_filter) = cachix_filter {
+ step = step.add_with(("pushFilter", cachix_filter));
+ }
+ step
+ }
+
+ pub fn build(flake_output: &str) -> Step<Run> {
+ named::bash(&format!(
+ "nix build .#{} -L --accept-flake-config",
+ flake_output
+ ))
+ }
+
+ pub fn limit_store() -> Step<Run> {
+ named::bash(indoc! {r#"
+ if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
+ nix-collect-garbage -d || true
+ fi"#
+ })
+ }
+
let runner = match platform {
Platform::Windows => unimplemented!(),
Platform::Linux => runners::LINUX_X86_BUNDLER,
@@ -55,52 +104,3 @@ pub(crate) fn build_nix(
job,
}
}
-
-// on our macs we manually install nix. for some reason the cachix action is running
-// under a non-login /bin/bash shell which doesn't source the proper script to add the
-// nix profile to PATH, so we manually add them here
-pub fn set_path() -> Step<Run> {
- named::bash(indoc! {r#"
- echo "/nix/var/nix/profiles/default/bin" >> "$GITHUB_PATH"
- echo "/Users/administrator/.nix-profile/bin" >> "$GITHUB_PATH"
- "#})
-}
-
-pub fn install_nix() -> Step<Use> {
- named::uses(
- "cachix",
- "install-nix-action",
- "02a151ada4993995686f9ed4f1be7cfbb229e56f", // v31
- )
- .add_with(("github_access_token", vars::GITHUB_TOKEN))
-}
-
-pub fn cachix_action(cachix_filter: Option<&str>) -> Step<Use> {
- let mut step = named::uses(
- "cachix",
- "cachix-action",
- "0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad", // v16
- )
- .add_with(("name", "zed"))
- .add_with(("authToken", vars::CACHIX_AUTH_TOKEN))
- .add_with(("cachixArgs", "-v"));
- if let Some(cachix_filter) = cachix_filter {
- step = step.add_with(("pushFilter", cachix_filter));
- }
- step
-}
-
-pub fn build(flake_output: &str) -> Step<Run> {
- named::bash(&format!(
- "nix build .#{} -L --accept-flake-config",
- flake_output
- ))
-}
-
-pub fn limit_store() -> Step<Run> {
- named::bash(indoc! {r#"
- if [ "$(du -sm /nix/store | cut -f1)" -gt 50000 ]; then
- nix-collect-garbage -d || true
- fi"#
- })
-}
@@ -45,7 +45,28 @@ pub(crate) fn release() -> Workflow {
.add_job(auto_release_preview.name, auto_release_preview.job)
}
+struct ReleaseBundleJobs {
+ linux_arm64: NamedJob,
+ linux_x86_64: NamedJob,
+ mac_arm64: NamedJob,
+ mac_x86_64: NamedJob,
+ windows_arm64: NamedJob,
+ windows_x86_64: NamedJob,
+}
+
fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob {
+ fn create_sentry_release() -> Step<Use> {
+ named::uses(
+ "getsentry",
+ "action-release",
+ "526942b68292201ac6bbb99b9a0747d4abee354c", // v3
+ )
+ .add_env(("SENTRY_ORG", "zed-dev"))
+ .add_env(("SENTRY_PROJECT", "zed"))
+ .add_env(("SENTRY_AUTH_TOKEN", "${{ secrets.SENTRY_AUTH_TOKEN }}"))
+ .add_with(("environment", "production"))
+ }
+
named::job(
dependant_job(deps)
.runs_on(runners::LINUX_SMALL)
@@ -66,27 +87,6 @@ fn auto_release_preview(deps: &[&NamedJob; 1]) -> NamedJob {
)
}
-fn create_sentry_release() -> Step<Use> {
- named::uses(
- "getsentry",
- "action-release",
- "526942b68292201ac6bbb99b9a0747d4abee354c", // v3
- )
- .add_env(("SENTRY_ORG", "zed-dev"))
- .add_env(("SENTRY_PROJECT", "zed"))
- .add_env(("SENTRY_AUTH_TOKEN", "${{ secrets.SENTRY_AUTH_TOKEN }}"))
- .add_with(("environment", "production"))
-}
-
-struct ReleaseBundleJobs {
- linux_arm64: NamedJob,
- linux_x86_64: NamedJob,
- mac_arm64: NamedJob,
- mac_x86_64: NamedJob,
- windows_arm64: NamedJob,
- windows_x86_64: NamedJob,
-}
-
fn upload_release_assets(deps: &[&NamedJob], bundle_jobs: &ReleaseBundleJobs) -> NamedJob {
fn download_workflow_artifacts() -> Step<Use> {
named::uses(
@@ -1,6 +1,6 @@
use crate::tasks::workflows::{
nix_build::build_nix,
- run_bundling::bundle_mac,
+ run_bundling::{bundle_mac, bundle_windows},
run_tests::run_platform_tests,
runners::{Arch, Platform},
steps::NamedJob,
@@ -135,7 +135,6 @@ fn bundle_linux_nightly(arch: Arch, deps: &[&NamedJob]) -> NamedJob {
.runs_on(arch.linux_bundler())
.add_step(steps::checkout_repo())
.add_step(steps::setup_sentry())
- .add_step(add_rust_to_path())
.add_step(steps::script("./script/linux"));
// todo(ci) can we do this on arm too?
@@ -163,12 +162,37 @@ fn bundle_windows_nightly(arch: Arch, deps: &[&NamedJob]) -> NamedJob {
.add_step(steps::checkout_repo())
.add_step(steps::setup_sentry())
.add_step(set_release_channel_to_nightly(platform))
- .add_step(build_zed_installer(arch))
- .add_step(upload_zed_nightly_windows(arch)),
+ .add_step(bundle_windows(arch))
+ .add_step(upload_zed_nightly(platform, arch)),
}
}
fn update_nightly_tag_job(deps: &[&NamedJob]) -> NamedJob {
+ fn update_nightly_tag() -> Step<Run> {
+ named::bash(indoc::indoc! {r#"
+ if [ "$(git rev-parse nightly)" = "$(git rev-parse HEAD)" ]; then
+ echo "Nightly tag already points to current commit. Skipping tagging."
+ exit 0
+ fi
+ git config user.name github-actions
+ git config user.email github-actions@github.com
+ git tag -f nightly
+ git push origin nightly --force
+ "#})
+ }
+
+ fn create_sentry_release() -> Step<Use> {
+ named::uses(
+ "getsentry",
+ "action-release",
+ "526942b68292201ac6bbb99b9a0747d4abee354c", // v3
+ )
+ .add_env(("SENTRY_ORG", "zed-dev"))
+ .add_env(("SENTRY_PROJECT", "zed"))
+ .add_env(("SENTRY_AUTH_TOKEN", vars::SENTRY_AUTH_TOKEN))
+ .add_with(("environment", "production"))
+ }
+
NamedJob {
name: "update_nightly_tag".to_owned(),
job: steps::release_job(deps)
@@ -197,10 +221,6 @@ fn set_release_channel_to_nightly(platform: Platform) -> Step<Run> {
}
}
-fn add_rust_to_path() -> Step<Run> {
- named::bash(r#"echo "$HOME/.cargo/bin" >> "$GITHUB_PATH""#)
-}
-
fn upload_zed_nightly(platform: Platform, arch: Arch) -> Step<Run> {
match platform {
Platform::Linux => named::bash(&format!("script/upload-nightly linux-targz {arch}")),
@@ -214,44 +234,3 @@ fn upload_zed_nightly(platform: Platform, arch: Arch) -> Step<Run> {
}
}
}
-
-fn build_zed_installer(arch: Arch) -> Step<Run> {
- let cmd = match arch {
- Arch::X86_64 => "script/bundle-windows.ps1 -Architecture x86_64",
- Arch::ARM64 => "script/bundle-windows.ps1 -Architecture aarch64",
- };
- named::pwsh(cmd).working_directory("${{ env.ZED_WORKSPACE }}")
-}
-
-fn upload_zed_nightly_windows(arch: Arch) -> Step<Run> {
- let cmd = match arch {
- Arch::X86_64 => "script/upload-nightly.ps1 -Architecture x86_64",
- Arch::ARM64 => "script/upload-nightly.ps1 -Architecture aarch64",
- };
- named::pwsh(cmd).working_directory("${{ env.ZED_WORKSPACE }}")
-}
-
-fn update_nightly_tag() -> Step<Run> {
- named::bash(indoc::indoc! {r#"
- if [ "$(git rev-parse nightly)" = "$(git rev-parse HEAD)" ]; then
- echo "Nightly tag already points to current commit. Skipping tagging."
- exit 0
- fi
- git config user.name github-actions
- git config user.email github-actions@github.com
- git tag -f nightly
- git push origin nightly --force
- "#})
-}
-
-fn create_sentry_release() -> Step<Use> {
- named::uses(
- "getsentry",
- "action-release",
- "526942b68292201ac6bbb99b9a0747d4abee354c", // v3
- )
- .add_env(("SENTRY_ORG", "zed-dev"))
- .add_env(("SENTRY_PROJECT", "zed"))
- .add_env(("SENTRY_AUTH_TOKEN", vars::SENTRY_AUTH_TOKEN))
- .add_with(("environment", "production"))
-}
@@ -144,7 +144,7 @@ pub(crate) fn bundle_windows_job(arch: runners::Arch, deps: &[&NamedJob]) -> Job
)
}
-fn bundle_windows(arch: runners::Arch) -> Step<Run> {
+pub fn bundle_windows(arch: runners::Arch) -> Step<Run> {
let step = match arch {
runners::Arch::X86_64 => named::pwsh("script/bundle-windows.ps1 -Architecture x86_64"),
runners::Arch::ARM64 => named::pwsh("script/bundle-windows.ps1 -Architecture aarch64"),