b157c5a · helix · git.iko.soy

.github/workflows/build.yml+4−17

compare with master

unifiedsplit

@@ -77,27 +77,14 @@ jobs:

77 path: target

78 key: ${{ runner.os }}-v2-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}

79

80+ - name: Copy minimal languages config

81+ run: cp .github/workflows/languages.toml ./languages.toml

82+

80 - name: Cache test tree-sitter grammar

83 - name: Cache test tree-sitter grammar

81 uses: actions/cache@v2.1.7

84 uses: actions/cache@v2.1.7

82 with:

85 with:

83 path: runtime/grammars

86 path: runtime/grammars

84− key: ${{ runner.os }}-v2-tree-sitter-grammars-${{ hashFiles('**/Cargo.lock') }}

87+ key: ${{ runner.os }}-v2-tree-sitter-grammars-${{ hashFiles('languages.toml') }}

85−

86− - run: cp .github/workflows/languages.toml ./languages.toml

87−

88− - name: Download test tree-sitter grammar

89− uses: actions-rs/cargo@v1

90− with:

91− use-cross: ${{ matrix.cross }}

92− command: run

93− args: -- --fetch-grammars

94−

95− - name: Build test tree-sitter grammar

96− uses: actions-rs/cargo@v1

97− with:

98− use-cross: ${{ matrix.cross }}

99− command: run

100− args: -- --build-grammars

101

88

102 - name: Run cargo test

89 - name: Run cargo test

103 uses: actions-rs/cargo@v1

90 uses: actions-rs/cargo@v1

.github/workflows/release.yml−14

@@ -62,20 +62,6 @@ jobs:

62 target: ${{ matrix.target }}

63 override: true

64

65− - name: Fetch tree-sitter grammars

66− uses: actions-rs/cargo@v1

67− with:

68− use-cross: ${{ matrix.cross }}

69− command: run

70− args: --release --locked --target ${{ matrix.target }} -- --fetch-grammars

71−

72− - name: Build tree-sitter grammars

73− uses: actions-rs/cargo@v1

74− with:

75− use-cross: ${{ matrix.cross }}

76− command: run

77− args: --release --locked --target ${{ matrix.target }} -- --build-grammars

78−

79 - name: Run cargo test

65 - name: Run cargo test

80 uses: actions-rs/cargo@v1

66 uses: actions-rs/cargo@v1

81 with:

67 with:

flake.nix+2

@@ -35,6 +35,8 @@

35 overrides = {

36 crateOverrides = common: _: rec {

37 helix-term = prev: {

38+ # disable fetching and building of tree-sitter grammars in the helix-term build.rs

39+ HELIX_DISABLE_AUTO_GRAMMAR_BUILD = "1";

38 buildInputs = (prev.buildInputs or [ ]) ++ [ common.cCompiler.cc.lib ];

40 buildInputs = (prev.buildInputs or [ ]) ++ [ common.cCompiler.cc.lib ];

39 nativeBuildInputs = (prev.nativeBuildInputs or [ ]) ++ [ common.pkgs.makeWrapper ];

41 nativeBuildInputs = (prev.nativeBuildInputs or [ ]) ++ [ common.pkgs.makeWrapper ];

40 preConfigure = ''

42 preConfigure = ''

helix-term/Cargo.toml+3−4

@@ -67,9 +67,8 @@ grep-searcher = "0.1.8"

67# Remove once retain_mut lands in stable rust

68retain_mut = "0.1.7"

69

70−# compiling grammars

71−cc = { version = "1" }

72−threadpool = { version = "1.0" }

73−

74[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100

70[target.'cfg(not(windows))'.dependencies] # https://github.com/vorner/signal-hook/issues/100

75signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

71signal-hook-tokio = { version = "0.3", features = ["futures-v0_3"] }

72+

73+[build-dependencies]

74+helix-loader = { version = "0.6", path = "../helix-loader" }

helix-term/build.rs+8

@@ -1,3 +1,4 @@

1+use helix_loader::grammar::{build_grammars, fetch_grammars};

1use std::borrow::Cow;

2use std::borrow::Cow;

2use std::process::Command;

3use std::process::Command;

3

4

@@ -14,5 +15,12 @@ fn main() {

14 None => env!("CARGO_PKG_VERSION").into(),

15 None => env!("CARGO_PKG_VERSION").into(),

15 };

16 };

16

17

18+ if std::env::var("HELIX_DISABLE_AUTO_GRAMMAR_BUILD").is_err() {

19+ fetch_grammars().expect("Failed to fetch tree-sitter grammars");

20+ build_grammars().expect("Failed to compile tree-sitter grammars");

21+ }

22+

23+ println!("cargo:rerun-if-changed=../runtime/grammars/");

24+

17 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);

25 println!("cargo:rustc-env=VERSION_AND_GIT_HASH={}", version);

18}

26}