diff options
| author | Nadrieril | 2020-05-30 14:35:28 +0100 |
|---|---|---|
| committer | GitHub | 2020-05-30 14:35:28 +0100 |
| commit | 97e46bef0fe1729d5de0a9a40ba939842023fea7 (patch) | |
| tree | 4ea0c6242c71977b892dd89f706713417fe6cfe9 | |
| parent | f554164014a85b8d4d7248a8bdfa6dbcd2009988 (diff) | |
| parent | 5ee2332305110b13deed27338fc2aa0d9fe03e2b (diff) | |
Merge pull request #168 from Nadrieril/windows
| -rw-r--r-- | .github/workflows/tests.yml | 30 | ||||
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | dhall/build.rs | 4 | ||||
| l--------- | dhall/src/syntax/text/dhall.abnf | 1 |
4 files changed, 33 insertions, 3 deletions
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c0be05c..5d8236c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,3 +78,33 @@ jobs: run: curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh - name: Run tests run: wasm-pack test serde_dhall --node + + # Tests don't work because of path escaping shenanigans. I have a branch that + # will fix that but depends on https://github.com/LukasKalbertodt/libtest-mimic/pull/4 + test_windows: + name: Build on windows + # name: Run tests on windows + runs-on: windows-latest + strategy: + matrix: + rust: + - stable + steps: + - name: Checkout branch + uses: actions/checkout@master + with: + submodules: true + - name: Setup Rust toolchain + uses: actions-rs/toolchain@v1 + with: + profile: minimal + toolchain: ${{ matrix.rust }} + override: true + - name: Build + uses: actions-rs/cargo@v1 + with: + command: build + # - name: Run tests + # uses: actions-rs/cargo@v1 + # with: + # command: test @@ -169,6 +169,7 @@ same name as the corresponding test. #### [Unreleased] +- Support building on Windows - Support building to wasm #### [0.5.2] - 2020-04-12 diff --git a/dhall/build.rs b/dhall/build.rs index 7ca4f21..71c634b 100644 --- a/dhall/build.rs +++ b/dhall/build.rs @@ -157,7 +157,7 @@ fn make_test_module( } fn generate_tests() -> std::io::Result<()> { - // To force regeneration of the test list, `touch dhall-lang/standard/dhall.abnf` + // To force regeneration of the test list, `touch dhall/build.rs` let out_dir = env::var("OUT_DIR").unwrap(); let parser_tests_path = Path::new(&out_dir).join("spec_tests.rs"); @@ -348,7 +348,7 @@ fn generate_tests() -> std::io::Result<()> { fn convert_abnf_to_pest() -> std::io::Result<()> { let out_dir = env::var("OUT_DIR").unwrap(); - let abnf_path = "src/syntax/text/dhall.abnf"; + let abnf_path = "../dhall-lang/standard/dhall.abnf"; let visibility_path = "src/syntax/text/dhall.pest.visibility"; let grammar_path = Path::new(&out_dir).join("dhall.pest"); println!("cargo:rerun-if-changed={}", abnf_path); diff --git a/dhall/src/syntax/text/dhall.abnf b/dhall/src/syntax/text/dhall.abnf deleted file mode 120000 index 4a95034..0000000 --- a/dhall/src/syntax/text/dhall.abnf +++ /dev/null @@ -1 +0,0 @@ -../../../../dhall-lang/standard/dhall.abnf
\ No newline at end of file |