Skip to content

Commit 54723c7

Browse files
committed
Merge branch 'macos-interface-fix'
2 parents 72660c2 + 06ef354 commit 54723c7

File tree

16 files changed

+641
-576
lines changed

16 files changed

+641
-576
lines changed

.cargo/config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[target.x86_64-apple-darwin]
2-
linker = "x86_64-apple-darwin20.2-clang"
3-
ar = "x86_64-apple-darwin20.2-ar"
2+
linker = "x86_64-apple-darwin21.4-clang"
3+
ar = "x86_64-apple-darwin21.4-ar"
44

55
[target.aarch64-apple-darwin]
6-
linker = "aarch64-apple-darwin20.2-clang"
7-
ar = "aarch64-apple-darwin20.2-ar"
6+
linker = "aarch64-apple-darwin21.4-clang"
7+
ar = "aarch64-apple-darwin21.4-ar"
88

99
[target.x86_64-pc-windows-gnu]
1010
linker = "x86_64-w64-mingw32-gcc"

.github/workflows/ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: [push, pull_request]
88
jobs:
99
check:
1010
name: Check
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-22.04
1212
steps:
1313
- name: Checkout sources
1414
uses: actions/checkout@v2
@@ -21,7 +21,7 @@ jobs:
2121
override: true
2222

2323
- name: Install system package deps
24-
run: sudo apt-get install libusb-1.0-0-dev
24+
run: sudo apt-get install libudev-dev
2525

2626
- name: Run cargo check
2727
uses: actions-rs/cargo@v1
@@ -30,7 +30,7 @@ jobs:
3030

3131
lint:
3232
name: Lint
33-
runs-on: ubuntu-18.04
33+
runs-on: ubuntu-22.04
3434
steps:
3535
- name: Checkout sources
3636
uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
4444
components: rustfmt, clippy
4545

4646
- name: Install system package deps
47-
run: sudo apt-get install libusb-1.0-0-dev
47+
run: sudo apt-get install libudev-dev
4848

4949
- name: Run cargo fmt
5050
uses: actions-rs/cargo@v1
@@ -60,7 +60,7 @@ jobs:
6060

6161
test:
6262
name: Test Suite
63-
runs-on: ubuntu-18.04
63+
runs-on: ubuntu-22.04
6464
steps:
6565
- name: Checkout sources
6666
uses: actions/checkout@v2
@@ -73,7 +73,7 @@ jobs:
7373
override: true
7474

7575
- name: Install system package deps
76-
run: sudo apt-get install libusb-1.0-0-dev
76+
run: sudo apt-get install libudev-dev
7777

7878
- name: Run cargo test
7979
uses: actions-rs/cargo@v1
@@ -82,7 +82,7 @@ jobs:
8282

8383
build-linux:
8484
name: Build linux release
85-
runs-on: ubuntu-18.04
85+
runs-on: ubuntu-22.04
8686
steps:
8787
- name: Checkout sources
8888
uses: actions/checkout@v2
@@ -95,7 +95,7 @@ jobs:
9595
override: true
9696

9797
- name: Install package deps
98-
run: sudo apt-get install libusb-1.0-0-dev -y
98+
run: sudo apt-get install libudev-dev -y
9999

100100
- name: Run cargo build
101101
uses: actions-rs/cargo@v1
@@ -111,7 +111,7 @@ jobs:
111111

112112
release-linux:
113113
name: Release linux
114-
runs-on: ubuntu-18.04
114+
runs-on: ubuntu-22.04
115115
steps:
116116
- name: Checkout sources
117117
uses: actions/checkout@v2
@@ -125,7 +125,7 @@ jobs:
125125

126126
- name: Install package deps
127127
run: >
128-
sudo apt-get install libusb-1.0-0-dev -y;
128+
sudo apt-get install libudev-dev -y;
129129
sudo apt-get install ruby -y;
130130
sudo gem install --no-doc fpm;
131131
cargo install toml-echo

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## 1.5.1
4+
- Fix bug where on macOS 13.3, the bridge would register one BitBox02 twice
5+
- Release built using the `shiftcrypto/bitbox-bridge:1` Docker image
6+
37
## 1.5.0
48

59
- Whitelist adalite.io

0 commit comments

Comments
 (0)