Skip to content

Commit

Permalink
Remove submodules from build process
Browse files Browse the repository at this point in the history
  • Loading branch information
Nemo157 committed Nov 12, 2022
1 parent c86d518 commit ee0fd01
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 22 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true
- id: install
run: |
rustup override set stable
Expand Down Expand Up @@ -143,8 +141,6 @@ jobs:

steps:
- uses: actions/checkout@v3
with:
submodules: true
- id: install
run: |
rustup override set stable
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
submodules: true

- name: Build the Docker image
run: docker build -t docs-rs -f dockerfiles/Dockerfile .
17 changes: 1 addition & 16 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,7 @@ fn main() -> Result<()> {
write_git_version(out_dir)?;
compile_sass(out_dir)?;
write_known_targets(out_dir)?;
compile_syntax(out_dir).context(
"\
could not compile syntax files\n\n\
Note: you may need to run `git submodule update --init`\
",
)?;
compile_syntax(out_dir).context("could not compile syntax files")?;
Ok(())
}

Expand Down Expand Up @@ -191,16 +186,6 @@ fn compile_syntax(out_dir: &Path) -> Result<()> {
parsing::{SyntaxDefinition, SyntaxSetBuilder},
};

if std::fs::metadata("assets/syntaxes").is_err() {
let status = std::process::Command::new("git")
.args(["submodule", "update", "--init"])
.status()
.context("attempting to initialize submodules")?;
if !status.success() {
return Err(anyhow::anyhow!("initializing submodules failed"));
}
}

fn tracked_add_from_folder(
builder: &mut SyntaxSetBuilder,
path: impl AsRef<Path>,
Expand Down

0 comments on commit ee0fd01

Please sign in to comment.