Merge branch 'master' into better-bufferline

.cargo/config.toml

@@ -1,3 +1,17 @@
+# we use tokio_unstable to enable runtime::Handle::id so we can separate
+# globals from multiple parallel tests. If that function ever does get removed
+# its possible to replace (with some additional overhead and effort)
+# Annoyingly build.rustflags doesn't work here because it gets overwritten
+# if people have their own global target.<..> config (for example to enable mold)
+# specifying flags this way is more robust as they get merged
+# This still gets overwritten by RUST_FLAGS though, luckily it shouldn't be necessary
+# to set those most of the time. If downstream does overwrite this its not a huge
+# deal since it will only break tests anyway
+[target."cfg(all())"]
+rustflags = ["--cfg", "tokio_unstable", "-C", "target-feature=-crt-static"]
+
+
 [alias]
 xtask = "run --package xtask --"
 integration-test = "test --features integration --profile integration --workspace --test integration"
+

.envrc

@@ -1,5 +1,6 @@
 watch_file shell.nix
 watch_file flake.lock
+watch_file rust-toolchain.toml
 
 # try to use flakes, if it fails use normal nix (ie. shell.nix)
 use flake || use nix

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -55,6 +55,16 @@ body:
  placeholder: wezterm 20220101-133340-7edc5b5a
  validations:
  required: true
+ - type: input
+ id: installation-method
+ attributes:
+ label: Installation Method
+ description: >
+ How you installed Helix - from a package manager like Homebrew or the
+ AUR, built from source, downloaded a binary from the releases page, etc.
+ placeholder: "source / brew / nixpkgs / flake / releases page"
+ validations:
+ required: true
  - type: input
  id: helix-version
  attributes:

.github/dependabot.yml

@@ -7,6 +7,14 @@ updates:
  directory: "/"
  schedule:
  interval: "weekly"
+ groups:
+ tree-sitter:
+ patterns:
+ - "tree-sitter*"
+ rust-dependencies:
+ update-types:
+ - "minor"
+ - "patch"
 
  - package-ecosystem: "github-actions"
  directory: "/"

.github/workflows/build.yml

@@ -12,6 +12,7 @@ jobs:
  check:
  name: Check (msrv)
  runs-on: ubuntu-latest
+ if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
  steps:
  - name: Checkout sources
  uses: actions/checkout@v4
@@ -22,13 +23,16 @@ jobs:
  override: true
 
  - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "build"
 
  - name: Run cargo check
  run: cargo check
 
  test:
  name: Test Suite
  runs-on: ${{ matrix.os }}
+ if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
  env:
  RUST_BACKTRACE: 1
  HELIX_LOG_LEVEL: info
@@ -37,12 +41,14 @@ jobs:
  uses: actions/checkout@v4
 
  - name: Install stable toolchain
- uses: dtolnay/rust-toolchain@1.65
+ uses: dtolnay/rust-toolchain@1.70
 
  - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "build"
 
  - name: Cache test tree-sitter grammar
- uses: actions/cache@v3
+ uses: actions/cache@v4
  with:
  path: runtime/grammars
  key: ${{ runner.os }}-stable-v${{ env.CACHE_VERSION }}-tree-sitter-grammars-${{ hashFiles('languages.toml') }}
@@ -61,16 +67,19 @@ jobs:
  lints:
  name: Lints
  runs-on: ubuntu-latest
+ if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
  steps:
  - name: Checkout sources
  uses: actions/checkout@v4
 
  - name: Install stable toolchain
- uses: dtolnay/rust-toolchain@1.65
+ uses: dtolnay/rust-toolchain@1.70
  with:
  components: rustfmt, clippy
 
  - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "build"
 
  - name: Run cargo fmt
  run: cargo fmt --all --check
@@ -86,14 +95,17 @@ jobs:
  docs:
  name: Docs
  runs-on: ubuntu-latest
+ if: github.repository == 'helix-editor/helix' || github.event_name != 'schedule'
  steps:
  - name: Checkout sources
  uses: actions/checkout@v4
 
  - name: Install stable toolchain
- uses: dtolnay/rust-toolchain@1.65
+ uses: dtolnay/rust-toolchain@1.70
 
  - uses: Swatinem/rust-cache@v2
+ with:
+ shared-key: "build"
 
  - name: Validate queries
  run: cargo xtask query-check

.github/workflows/cachix.yml

@@ -14,10 +14,10 @@ jobs:
  uses: actions/checkout@v4
 
  - name: Install nix
- uses: cachix/install-nix-action@v23
+ uses: cachix/install-nix-action@V27
 
  - name: Authenticate with Cachix
- uses: cachix/cachix-action@v12
+ uses: cachix/cachix-action@v15
  with:
  name: helix
  authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}

.github/workflows/gh-pages.yml

@@ -14,7 +14,7 @@ jobs:
  - uses: actions/checkout@v4
 
  - name: Setup mdBook
- uses: peaceiris/actions-mdbook@v1
+ uses: peaceiris/actions-mdbook@v2
  with:
  mdbook-version: 'latest'
  # mdbook-version: '0.4.8'
@@ -26,16 +26,16 @@ jobs:
  OUTDIR=$(basename ${{ github.ref }})
  echo "OUTDIR=$OUTDIR" >> $GITHUB_ENV
 
- - name: Deploy
- uses: peaceiris/actions-gh-pages@v3
+ - name: Deploy stable
+ uses: peaceiris/actions-gh-pages@v4
+ if: startswith(github.ref, 'refs/tags/')
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  publish_dir: ./book/book
- destination_dir: ./${{ env.OUTDIR }}
 
- - name: Deploy stable
- uses: peaceiris/actions-gh-pages@v3
- if: startswith(github.ref, 'refs/tags/')
+ - name: Deploy
+ uses: peaceiris/actions-gh-pages@v4
  with:
  github_token: ${{ secrets.GITHUB_TOKEN }}
  publish_dir: ./book/book
+ destination_dir: ./${{ env.OUTDIR }}

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
  - name: Bundle grammars
  run: tar cJf grammars.tar.xz -C runtime/grammars/sources .
 
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: grammars
  path: grammars.tar.xz
@@ -70,11 +70,11 @@ jobs:
  rust: stable
  target: aarch64-unknown-linux-gnu
  cross: true
- - build: riscv64-linux
- os: ubuntu-latest
- rust: stable
- target: riscv64gc-unknown-linux-gnu
- cross: true
+ # - build: riscv64-linux
+ #  os: ubuntu-latest
+ #  rust: stable
+ #  target: riscv64gc-unknown-linux-gnu
+ #  cross: true
  - build: x86_64-macos
  os: macos-latest
  rust: stable
@@ -106,7 +106,7 @@ jobs:
  uses: actions/checkout@v4
 
  - name: Download grammars
- uses: actions/download-artifact@v3
+ uses: actions/download-artifact@v4
 
  - name: Move grammars under runtime
  if: "!startsWith(matrix.os, 'windows')"
@@ -220,7 +220,7 @@ jobs:
  fi
  cp -r runtime dist
 
- - uses: actions/upload-artifact@v3
+ - uses: actions/upload-artifact@v4
  with:
  name: bins-${{ matrix.build }}
  path: dist
@@ -233,7 +233,7 @@ jobs:
  - name: Checkout sources
  uses: actions/checkout@v4
 
- - uses: actions/download-artifact@v3
+ - uses: actions/download-artifact@v4
 
  - name: Build archive
  shell: bash
@@ -288,7 +288,7 @@ jobs:
  overwrite: true
 
  - name: Upload binaries as artifact
- uses: actions/upload-artifact@v3
+ uses: actions/upload-artifact@v4
  if: env.preview == 'true'
  with:
  name: release