Skip to content

Commit 8c2b0c5

Browse files
0xrinegade0xrinegade
authored
Merge pull request #262 from openSVM/copilot/fix-96220a7b-e84c-4874-b997-f89cc6fb94cb
Fix hidapi v2.6.3 build failure by adding missing native dependencies to CI workflows
2 parents 7d5212b + fcea4ef commit 8c2b0c5

File tree

5 files changed

+45
-26
lines changed

5 files changed

+45
-26
lines changed

‎.github/workflows/audit.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,15 @@ jobs:
5757
rm -rf typst.tar.xz typst-x86_64-unknown-linux-musl/
5858
typst --version
5959
60+
- name: Install native dependencies for hidapi
61+
run: |
62+
sudo apt-get update
63+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
64+
6065
- name: Build OSVM CLI
6166
run: |
6267
cd osvm-cli
63-
cargo build --release
68+
cargo build --release --locked
6469
6570
- name: Run tests
6671
run: |

‎.github/workflows/ci.yml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- uses: actions/checkout@v4
19-
- name: Install dependencies
20-
run: sudo apt-get update && sudo apt-get install -y libudev-dev pkg-config libssl-dev perl
19+
- name: Install native dependencies for hidapi
20+
run: |
21+
sudo apt-get update
22+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
2123
2224
- name: Install Rust
2325
uses: dtolnay/rust-toolchain@stable
@@ -55,8 +57,10 @@ jobs:
5557
steps:
5658
- uses: actions/checkout@v4
5759

58-
- name: Install dependencies
59-
run: sudo apt-get update && sudo apt-get install -y libudev-dev pkg-config libssl-dev perl
60+
- name: Install native dependencies for hidapi
61+
run: |
62+
sudo apt-get update
63+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
6064
6165
- name: Install Rust
6266
uses: dtolnay/rust-toolchain@stable
@@ -97,8 +101,10 @@ jobs:
97101
steps:
98102
- uses: actions/checkout@v4
99103

100-
- name: Install dependencies
101-
run: sudo apt-get update && sudo apt-get install -y libudev-dev pkg-config libssl-dev perl
104+
- name: Install native dependencies for hidapi
105+
run: |
106+
sudo apt-get update
107+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
102108
103109
- name: Install Rust
104110
uses: dtolnay/rust-toolchain@stable
@@ -117,7 +123,7 @@ jobs:
117123
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
118124

119125
- name: Build binary
120-
run: cargo build --release
126+
run: cargo build --release --locked
121127
working-directory: .
122128

123129
- name: Install Solana CLI tools
@@ -143,8 +149,10 @@ jobs:
143149
steps:
144150
- uses: actions/checkout@v4
145151

146-
- name: Install dependencies
147-
run: sudo apt-get update && sudo apt-get install -y libudev-dev pkg-config libssl-dev perl
152+
- name: Install native dependencies for hidapi
153+
run: |
154+
sudo apt-get update
155+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
148156
149157
- name: Install Rust
150158
uses: dtolnay/rust-toolchain@stable

‎.github/workflows/release.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,18 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22-
- name: Install dependencies
23-
run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev pkg-config libssl-dev perl
22+
- name: Install native dependencies for hidapi
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install -y libhidapi-dev libudev-dev libusb-1.0-0-dev pkg-config libssl-dev perl
2426
2527
- name: Install Rust
2628
uses: dtolnay/rust-toolchain@stable
2729
with:
2830
toolchain: stable
2931

3032
- name: Build release binary
31-
run: cargo build --release
33+
run: cargo build --release --locked
3234
working-directory: .
3335

3436
- name: Upload binary
@@ -242,8 +244,10 @@ jobs:
242244
steps:
243245
- uses: actions/checkout@v4
244246

245-
- name: Install dependencies
246-
run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev pkg-config libssl-dev perl
247+
- name: Install native dependencies for hidapi
248+
run: |
249+
sudo apt-get update
250+
sudo apt-get install -y libhidapi-dev libudev-dev libusb-1.0-0-dev pkg-config libssl-dev perl
247251
248252
- name: Install Rust
249253
uses: dtolnay/rust-toolchain@stable
@@ -272,16 +276,18 @@ jobs:
272276
steps:
273277
- uses: actions/checkout@v4
274278

275-
- name: Install dependencies
276-
run: sudo apt-get update && sudo apt-get install -y libusb-1.0-0-dev libudev-dev pkg-config libssl-dev perl
279+
- name: Install native dependencies for hidapi
280+
run: |
281+
sudo apt-get update
282+
sudo apt-get install -y libhidapi-dev libudev-dev libusb-1.0-0-dev pkg-config libssl-dev perl
277283
278284
- name: Install Rust
279285
uses: dtolnay/rust-toolchain@stable
280286
with:
281287
toolchain: stable
282288

283289
- name: Verify build
284-
run: cargo build --release
290+
run: cargo build --release --locked
285291
working-directory: .
286292

287293
- name: Publish to crates.io

‎.github/workflows/security.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v4
1717

18-
- name: Install Dependencies
18+
- name: Install native dependencies for hidapi
1919
run: |
2020
sudo apt-get update
21-
sudo apt-get install libudev-dev
21+
sudo apt-get install -y libhidapi-dev libudev-dev
2222
2323
- name: Install Rust
2424
uses: dtolnay/rust-toolchain@stable
@@ -70,10 +70,10 @@ jobs:
7070
- name: Checkout repository
7171
uses: actions/checkout@v4
7272

73-
- name: Install Dependencies
73+
- name: Install native dependencies for hidapi
7474
run: |
7575
sudo apt-get update
76-
sudo apt-get install libudev-dev
76+
sudo apt-get install -y libhidapi-dev libudev-dev
7777
7878
- name: Initialize CodeQL
7979
uses: github/codeql-action/init@v3
@@ -83,7 +83,7 @@ jobs:
8383
CODEQL_ENABLE_EXPERIMENTAL_FEATURES: true
8484

8585
- name: Build
86-
run: cargo build
86+
run: cargo build --locked
8787
working-directory: .
8888

8989
- name: Perform CodeQL Analysis

‎.github/workflows/test-svm-action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,15 @@ jobs:
9494
- name: Checkout repository
9595
uses: actions/checkout@v4
9696

97-
- name: Install system dependencies
97+
- name: Install native dependencies for hidapi
9898
run: |
9999
sudo apt-get update
100-
sudo apt-get install -y libudev-dev pkg-config libssl-dev perl
100+
sudo apt-get install -y libhidapi-dev libudev-dev pkg-config libssl-dev perl
101101
102102
- name: Dry run - Build OSVM CLI
103103
run: |
104104
echo "Building OSVM CLI for dry run test..."
105-
cargo build --release
105+
cargo build --release --locked
106106
107107
# Verify the binary works
108108
./target/release/osvm --version

0 commit comments

Comments
 (0)