Merge pull request #196 from xen0n/updates

Dep and CI updates

Author: xen0n

.github/workflows/mean_bean_ci.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: XAMPPRocky/get-github-release@v1
         id: cross
         with:
-          owner: rust-embedded
+          owner: cross-rs
           repo: cross
           matches: ${{ matrix.platform }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -87,6 +87,7 @@ jobs:
         channel: [stable]
         target:
           # macOS
+          - aarch64-apple-darwin
           - x86_64-apple-darwin
 
   linux:
@@ -128,24 +129,15 @@ jobs:
           - armv7-unknown-linux-musleabihf
           - i686-unknown-linux-musl
           - mips-unknown-linux-musl
-          # FIXME: cross doesn't know about these
-          # - mips64-unknown-linux-muslabi64
-          # - mips64el-unknown-linux-muslabi64
-          #
-          # add back the glibc dynamically linked glibc targets as a stop-gap
-          # measure:
-          - mips64-unknown-linux-gnuabi64
-          - mips64el-unknown-linux-gnuabi64
-
+          - mips64-unknown-linux-muslabi64
+          - mips64el-unknown-linux-muslabi64
           - mipsel-unknown-linux-musl
           - powerpc-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
           - powerpc64le-unknown-linux-gnu
           - s390x-unknown-linux-gnu
+          - sparc64-unknown-linux-gnu
           - x86_64-unknown-linux-musl
-          # FIXME: weird cross Docker image problem (cannot find image despite
-          # being supported)
-          # - powerpc64-unknown-linux-gnu
-          # - sparc64-unknown-linux-gnu
 
           # Android
           - aarch64-linux-android

.github/workflows/mean_bean_deploy.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: XAMPPRocky/get-github-release@v1
         id: cross
         with:
-          owner: rust-embedded
+          owner: cross-rs
           repo: cross
           matches: ${{ matrix.platform }}
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -85,6 +85,7 @@ jobs:
       matrix:
         target:
           # macOS
+          - aarch64-apple-darwin
           - x86_64-apple-darwin
     steps:
       - uses: actions/checkout@v2
@@ -123,9 +124,9 @@ jobs:
       matrix:
         target:
           # Linux
-          - aarch64-unknown-linux-gnu
-          - arm-unknown-linux-gnueabi
-          - armv7-unknown-linux-gnueabihf
+          - aarch64-unknown-linux-musl
+          - arm-unknown-linux-musleabi
+          - armv7-unknown-linux-musleabihf
           - i686-unknown-linux-musl
           - mips-unknown-linux-musl
           - mips64-unknown-linux-muslabi64
@@ -150,6 +151,7 @@ jobs:
           - x86_64-unknown-netbsd
           # Solaris
           - sparcv9-sun-solaris
+          - x86_64-sun-solaris
           # Bare Metal
           # These are no-std embedded targets, so they will only build if your
           # crate is `no_std` compatible.

Cargo.lock

@@ -20,10 +20,10 @@ nightly = []
 
 
 [dependencies]
-atomicwrites = "0.3.1"
+atomicwrites = "0.3"
 clap = { version = "4", features = ["cargo", "wrap_help"] }
 regex = "1.7"
-serde = "1.0.149"
-serde_derive = "1.0.149"
+serde = "1.0"
+serde_derive = "1.0"
 strsim = "0.10"
 dirs = "4.0"