Fix CI checks (#465)

* Adopt fork of gha-ubuntu-cross with apt update fix.

* Fix new clippy warning.  We really do want an array with a single Range member.

* Update to better fix for gha-ubuntu-cross

* Avoid updating clap to newer minor versions

* Resolve incorrect_partial_ord_impl_on_ord_type clippy error

---------

Co-authored-by: Dániel Buga <[email protected]>

Author: Joseph Ross

.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@v6
       with:
         arch: ${{ inputs.arch }}
 

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 }

espflash/src/elf.rs

@@ -220,7 +220,7 @@ impl PartialEq for CodeSegment<'_> {
 
 impl PartialOrd for CodeSegment<'_> {
     fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-        self.addr.partial_cmp(&other.addr)
+        Some(self.cmp(other))
     }
 }
 

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<u32>] = &[
     0x40200000..0x40300000, // IROM
 ];