Skip to content

Commit 2dc334f

Browse files
authored
Restore CI to working order (#121)
* Change apt mirror to official Ubuntu archives * Fix a formatting issue causing the workflow to fail
1 parent 92a266d commit 2dc334f

File tree

2 files changed

+27
-4
lines changed

2 files changed

+27
-4
lines changed

.github/workflows/rust.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ jobs:
77
name: Check
88
runs-on: ubuntu-latest
99
steps:
10+
- name: Change apt mirror
11+
run: |
12+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
13+
sudo apt-get update
1014
- name: build dependencies
1115
run: |
1216
sudo apt-get install musl-tools libudev-dev
@@ -25,6 +29,10 @@ jobs:
2529
name: Doc Test
2630
runs-on: ubuntu-latest
2731
steps:
32+
- name: Change apt mirror
33+
run: |
34+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
35+
sudo apt-get update
2836
- name: build dependencies
2937
run: |
3038
sudo apt-get install musl-tools libudev-dev
@@ -44,6 +52,10 @@ jobs:
4452
name: Unit Test
4553
runs-on: ubuntu-latest
4654
steps:
55+
- name: Change apt mirror
56+
run: |
57+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
58+
sudo apt-get update
4759
- name: build dependencies
4860
run: |
4961
sudo apt-get install musl-tools libudev-dev
@@ -63,6 +75,10 @@ jobs:
6375
name: Rustfmt
6476
runs-on: ubuntu-latest
6577
steps:
78+
- name: Change apt mirror
79+
run: |
80+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
81+
sudo apt-get update
6682
- uses: actions/checkout@v2
6783
- uses: actions-rs/toolchain@v1
6884
with:
@@ -80,6 +96,10 @@ jobs:
8096
name: Clippy
8197
runs-on: ubuntu-latest
8298
steps:
99+
- name: Change apt mirror
100+
run: |
101+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
102+
sudo apt-get update
83103
- name: build dependencies
84104
run: |
85105
sudo apt-get install musl-tools libudev-dev
@@ -148,10 +168,15 @@ jobs:
148168
with:
149169
name: cargo-espflash.exe
150170
path: target/x86_64-pc-windows-gnu/release/cargo-espflash.exe
171+
151172
msrv:
152173
name: Check MSRV
153174
runs-on: ubuntu-latest
154175
steps:
176+
- name: Change apt mirror
177+
run: |
178+
sudo sed -i 's/azure.archive.ubuntu.com/archive.ubuntu.com/' /etc/apt/sources.list
179+
sudo apt-get update
155180
- name: build dependencies
156181
run: |
157182
sudo apt-get install musl-tools libudev-dev
@@ -164,4 +189,4 @@ jobs:
164189
- uses: Swatinem/rust-cache@v1
165190
- uses: actions-rs/cargo@v1
166191
with:
167-
command: check
192+
command: check

espflash/src/cli/serial.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,7 @@ fn select_serial_port(
172172

173173
match ports.get(index) {
174174
Some(
175-
port_info
176-
@
177-
SerialPortInfo {
175+
port_info @ SerialPortInfo {
178176
port_type: SerialPortType::UsbPort(usb_info),
179177
..
180178
},

0 commit comments

Comments
 (0)