Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use a script instead of submodules for grammars #1560

Closed
wants to merge 20 commits into from
Closed

use a script instead of submodules for grammars #1560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6306167
remove submodules on languages
the-mikedavis Jan 22, 2022
8d9fead
compile a doc of grammar remotes
the-mikedavis Jan 22, 2022
29eaca9
initial draft of grammar script in shell
the-mikedavis Jan 22, 2022
91198f5
fix location of fetch comment
the-mikedavis Jan 22, 2022
994c1fe
use grammars script in CI rather than submodule checkout
the-mikedavis Jan 22, 2022
753e1a5
use array construction to split on whitespace
the-mikedavis Jan 22, 2022
fa56b46
prefer brace-delimiting variables
the-mikedavis Jan 22, 2022
80a49fa
heed shellcheck advice
the-mikedavis Jan 22, 2022
c8329f3
align commit shas in revisions file
the-mikedavis Jan 25, 2022
dd5ae25
add status command
the-mikedavis Jan 25, 2022
50daae4
update readme and languages section with new instructions
the-mikedavis Jan 25, 2022
f8467b0
draft batch script for grammars
the-mikedavis Jan 25, 2022
d7b2cb1
improve panic message for invalid queries
the-mikedavis Jan 31, 2022
018e1d2
draft status command for windows batchfile
the-mikedavis Feb 1, 2022
76011c7
clean up status command in batchfile
the-mikedavis Feb 1, 2022
283157d
update syntax crate's references to submodules
the-mikedavis Feb 2, 2022
67182bf
convert syntax builder into xtask
the-mikedavis Feb 2, 2022
a760145
add note on build-grammars xtask to readme
the-mikedavis Feb 2, 2022
f0f990f
move get_language under type definitions
the-mikedavis Feb 2, 2022
88bd351
set CC's host and target
the-mikedavis Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: true

- name: Fetch grammars
run: ./scripts/grammars sync

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -53,8 +54,14 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: true

- name: Fetch grammars (Windows)
if: startsWith(matrix.os, 'windows')
run: scripts/grammars.cmd sync

- name: Fetch grammars (Unix)
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
run: scripts/grammars sync

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -97,8 +104,9 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: true

- name: Fetch grammars
run: ./scripts/grammars sync

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -144,8 +152,9 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: true

- name: Fetch grammars
run: ./scripts/grammars sync

- name: Install stable toolchain
uses: actions-rs/toolchain@v1
Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: true

- name: Fetch grammars (Windows)
if: startsWith(matrix.os, 'windows')
run: scripts/grammars.cmd sync

- name: Fetch grammars (Unix)
if: startsWith(matrix.os, 'macos') || startsWith(matrix.os, 'ubuntu')
run: scripts/grammars sync

- name: Install ${{ matrix.rust }} toolchain
uses: actions-rs/toolchain@v1
Expand Down Expand Up @@ -114,8 +120,9 @@ jobs:
steps:
- name: Checkout sources
uses: actions/checkout@v2
with:
submodules: false

- name: Fetch grammars
uses: ./scripts/grammars sync

- uses: actions/download-artifact@v2
# with:
Expand Down
216 changes: 0 additions & 216 deletions .gitmodules
View file
Open in desktop

This file was deleted.

17 changes: 5 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ members = [
"helix-view",
"helix-term",
"helix-tui",
"helix-syntax",
"helix-lsp",
"xtask",
]
Expand Down
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ We provide packaging for various distributions, but here's a quick method to
build from source.

```
git clone --recurse-submodules --shallow-submodules -j8 https://github.com/helix-editor/helix
git clone https://github.com/helix-editor/helix
cd helix
./scripts/grammars sync
cargo xtask build-grammars
cargo install --path helix-term
```

Expand Down
Loading