From da114a6cf156a21371c2b28fd56f892acec7453b Mon Sep 17 00:00:00 2001 From: Joseph Ross Date: Thu, 24 Aug 2023 20:18:37 -0700 Subject: [PATCH 1/5] Adopt fork of gha-ubuntu-cross with apt update fix. --- .github/actions/setup-arm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-arm/action.yml b/.github/actions/setup-arm/action.yml index f3ff7cb1..1d03092c 100644 --- a/.github/actions/setup-arm/action.yml +++ b/.github/actions/setup-arm/action.yml @@ -33,7 +33,7 @@ runs: - uses: Swatinem/rust-cache@v2 - name: Install Cross-Compile Support - uses: cyberjunk/gha-ubuntu-cross@v3 + uses: junelife/gha-ubuntu-cross@v4 with: arch: ${{ inputs.arch }} From c2e431afdd836bab899eae6a9bd810576a4d19ee Mon Sep 17 00:00:00 2001 From: Joseph Ross Date: Thu, 24 Aug 2023 20:50:20 -0700 Subject: [PATCH 2/5] Fix new clippy warning. We really do want an array with a single Range member. --- espflash/src/targets/esp8266.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/espflash/src/targets/esp8266.rs b/espflash/src/targets/esp8266.rs index 993366ca..eb6605b3 100644 --- a/espflash/src/targets/esp8266.rs +++ b/espflash/src/targets/esp8266.rs @@ -13,6 +13,7 @@ use crate::{ const CHIP_DETECT_MAGIC_VALUES: &[u32] = &[0xfff0_c101]; +#[allow(clippy::single_range_in_vec_init)] const FLASH_RANGES: &[Range] = &[ 0x40200000..0x40300000, // IROM ]; From fd083c0515fa8c8b4556d20ac7254b356871febd Mon Sep 17 00:00:00 2001 From: Joseph Ross Date: Sat, 2 Sep 2023 22:56:17 -0700 Subject: [PATCH 3/5] Update to better fix for gha-ubuntu-cross --- .github/actions/setup-arm/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-arm/action.yml b/.github/actions/setup-arm/action.yml index 1d03092c..671fa3d0 100644 --- a/.github/actions/setup-arm/action.yml +++ b/.github/actions/setup-arm/action.yml @@ -33,7 +33,7 @@ runs: - uses: Swatinem/rust-cache@v2 - name: Install Cross-Compile Support - uses: junelife/gha-ubuntu-cross@v4 + uses: junelife/gha-ubuntu-cross@v6 with: arch: ${{ inputs.arch }} From d200956ab825ab5ab8c4dfe6b400096b7712bfc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Sun, 27 Aug 2023 05:32:10 +0200 Subject: [PATCH 4/5] Avoid updating clap to newer minor versions --- espflash/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/espflash/Cargo.toml b/espflash/Cargo.toml index 60f4f242..9da2626e 100644 --- a/espflash/Cargo.toml +++ b/espflash/Cargo.toml @@ -35,8 +35,8 @@ addr2line = { version = "0.20.0", optional = true } base64 = "0.21.2" binread = "2.2.0" bytemuck = { version = "1.13.1", features = ["derive"] } -clap = { version = "4.3.11", features = ["derive", "env", "wrap_help"], optional = true } -clap_complete = { version = "4.3.2", optional = true } +clap = { version = "4.3.*", features = ["derive", "env", "wrap_help"], optional = true } +clap_complete = { version = "4.3.*", optional = true } comfy-table = { version = "7.0.1", optional = true } crossterm = { version = "0.25.0", optional = true } # 0.26.x causes issues on Windows ctrlc = { version = "3.4.0", optional = true } From fde87a0001e9cceb36fb7ec2ea3f277546c4cb50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Buga?= Date: Sun, 27 Aug 2023 05:45:40 +0200 Subject: [PATCH 5/5] Resolve incorrect_partial_ord_impl_on_ord_type clippy error --- espflash/src/elf.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/espflash/src/elf.rs b/espflash/src/elf.rs index 20f2650d..7554d1bb 100644 --- a/espflash/src/elf.rs +++ b/espflash/src/elf.rs @@ -220,7 +220,7 @@ impl PartialEq for CodeSegment<'_> { impl PartialOrd for CodeSegment<'_> { fn partial_cmp(&self, other: &Self) -> Option { - self.addr.partial_cmp(&other.addr) + Some(self.cmp(other)) } }