Skip to content

Commit 04a4de5

Browse files
author
Maxime LUCE
committed
ci: prepare build
1 parent 168079c commit 04a4de5

4 files changed

Lines changed: 15 additions & 8 deletions

File tree

.github/workflows/CI.yml

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ jobs:
2929
runs-on: ubuntu-latest
3030
steps:
3131
- uses: actions/checkout@v6
32+
- name: setup system dependencies
33+
run: sudo apt-get update && sudo apt-get install -y libxdo-dev libxkbcommon-dev libxi-dev libxtst-dev
3234
- name: setup pnpm
3335
uses: pnpm/action-setup@v5
3436
- name: Setup node
@@ -64,29 +66,32 @@ jobs:
6466
target: i686-pc-windows-msvc
6567
- host: ubuntu-latest
6668
target: x86_64-unknown-linux-gnu
67-
build: pnpm build --target x86_64-unknown-linux-gnu --use-napi-cross
69+
build: pnpm build --target x86_64-unknown-linux-gnu
6870
- host: macos-latest
6971
target: aarch64-apple-darwin
7072
build: pnpm build --target aarch64-apple-darwin
7173
- host: ubuntu-latest
7274
target: aarch64-unknown-linux-gnu
73-
build: pnpm build --target aarch64-unknown-linux-gnu --use-napi-cross
74-
- host: ubuntu-latest
75+
build: pnpm build --target aarch64-unknown-linux-gnu
76+
- host: ubuntu-24.04-arm
7577
target: armv7-unknown-linux-gnueabihf
7678
build: pnpm build --target armv7-unknown-linux-gnueabihf --use-napi-cross
7779
- host: windows-latest
7880
target: aarch64-pc-windows-msvc
7981
build: pnpm build --target aarch64-pc-windows-msvc
80-
name: stable - ${{ matrix.settings.target }} - node@20
82+
name: stable - ${{ matrix.settings.target }} - node@24
8183
runs-on: ${{ matrix.settings.host }}
8284
steps:
8385
- uses: actions/checkout@v6
86+
- name: setup system dependencies
87+
run: sudo apt-get update && sudo apt-get install -y libxdo-dev libxkbcommon-dev libxi-dev libxtst-dev
88+
if: ${{ contains(matrix.settings.host, 'ubuntu') }}
8489
- name: setup pnpm
8590
uses: pnpm/action-setup@v5
8691
- name: Setup node
8792
uses: actions/setup-node@v6
8893
with:
89-
node-version: 22
94+
node-version: 24
9095
cache: pnpm
9196
- name: Install
9297
uses: dtolnay/rust-toolchain@stable
@@ -205,6 +210,8 @@ jobs:
205210
runs-on: ${{ contains(matrix.target, 'aarch64') && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
206211
steps:
207212
- uses: actions/checkout@v6
213+
- name: setup system dependencies
214+
run: sudo apt-get update && sudo apt-get install -y libxdo-dev libxkbcommon-dev libxi-dev libxtst-dev
208215
- name: setup pnpm
209216
uses: pnpm/action-setup@v5
210217
- name: Setup node

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ crate-type = ["cdylib"]
1010
[dependencies]
1111
napi = "3.0.0"
1212
napi-derive = "3.0.0"
13-
enigo = "0.6.1"
13+
enigo = { version = "0.6.1", features = ["wayland", "xdo", "x11rb"] }
1414

1515
[build-dependencies]
1616
napi-build = "2"

src/error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ impl From<JsError> for napi::Error<&'static str> {
5454

5555
impl From<JsError> for napi::JsError<&'static str> {
5656
fn from(value: JsError) -> Self {
57-
value.into()
57+
napi::JsError::from(napi::Error::from(value))
5858
}
5959
}

src/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,5 +635,5 @@ pub fn key_from_string(key: String) -> Result<enigo::Key> {
635635
fn char_from_string(key: &str) -> Result<char> {
636636
key.chars()
637637
.next()
638-
.ok_or_else(|| JsError::invalid_input(&key))
638+
.ok_or_else(|| JsError::invalid_input(key))
639639
}

0 commit comments

Comments
 (0)