Skip to content

Commit

Permalink
Fix using mlua in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
noib3 committed Dec 26, 2024
1 parent 847f8d2 commit 1beb3d5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
16 changes: 8 additions & 8 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[target.x86_64-apple-darwin]
rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]
rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]

[target.aarch64-apple-darwin]
rustflags = [
"-C", "link-arg=-undefined",
"-C", "link-arg=dynamic_lookup",
]
rustflags = ["-C", "link-arg=-undefined", "-C", "link-arg=dynamic_lookup"]

[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "link-args=/FORCE:MULTIPLE"]

[target.aarch64-pc-windows-msvc]
rustflags = ["-C", "link-args=/FORCE:MULTIPLE"]
7 changes: 6 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,16 @@ jobs:
with:
neovim: true
version: ${{ matrix.neovim }}
- name: Install libluajit (Linux)
if: runner.os == 'Linux'
run: sudo apt-get update && sudo apt-get install -y libluajit-5.1-dev
- name: Install libluajit (macOS)
if: runner.os == 'macOS'
run: brew install luajit
- name: Install latest stable `rustc`
uses: dtolnay/rust-toolchain@stable
- name: Run tests
run: cargo test --workspace ${{ matrix.features }}
working-directory: .

clippy:
name: clippy
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ thiserror = { workspace = true }
nvim-oxi = { path = "..", features = ["libuv", "mlua", "test"] }

[target.'cfg(any(target_os = "windows", target_env = "msvc"))'.dependencies]
nvim-oxi = { path = "..", features = ["mlua", "test"] }
nvim-oxi = { path = "..", features = ["mlua", "test", "__vendored_luajit"] }

[build-dependencies]
nvim-oxi = { path = "..", features = ["test"] }

0 comments on commit 1beb3d5

Please sign in to comment.