Skip to content

Commit

Permalink
Merge branch 'master' into feat/extend-goto-file
Browse files Browse the repository at this point in the history
  • Loading branch information
TornaxO7 committed Feb 24, 2024
2 parents 583d9aa + 6db666f commit 9bbccc5
Show file tree
Hide file tree
Showing 212 changed files with 10,094 additions and 3,171 deletions.
14 changes: 14 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -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"

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
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') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cachix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
uses: actions/checkout@v4

- name: Install nix
uses: cachix/install-nix-action@v24
uses: cachix/install-nix-action@v25

- name: Authenticate with Cachix
uses: cachix/cachix-action@v13
uses: cachix/cachix-action@v14
with:
name: helix
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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')"
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions .ignore

This file was deleted.

Loading

0 comments on commit 9bbccc5

Please sign in to comment.