From 6d8613d0321b88e8040e29298aaa12584be45185 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Fri, 7 Apr 2023 23:53:15 +0800
Subject: [PATCH] Make CI work again

---
 .github/workflows/ci.yml                |  6 ++++++
 async/rust-toolchain.toml               |  2 +-
 embassy/demos/picow/rust-toolchain.toml |  2 +-
 embassy/demos/std/rust-toolchain.toml   |  2 +-
 embassy/rust-toolchain.toml             |  2 +-
 testing/ci.sh                           | 16 +++++++++-------
 6 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 951fd34..8410018 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,3 +42,9 @@ jobs:
 
       - name: build
         run: ./testing/ci.sh
+
+      - name: picow bloat
+        uses: actions/upload-artifact@v3
+        with:
+          name: picow-bloat
+          path: ci_out/picow-bloat.txt
diff --git a/async/rust-toolchain.toml b/async/rust-toolchain.toml
index 67957e6..549c093 100644
--- a/async/rust-toolchain.toml
+++ b/async/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2023-02-12"
+channel = "nightly-2023-04-07"
 components = [ "rust-src", "rustfmt" ]
 targets = [
     "thumbv6m-none-eabi",
diff --git a/embassy/demos/picow/rust-toolchain.toml b/embassy/demos/picow/rust-toolchain.toml
index 02a0448..549c093 100644
--- a/embassy/demos/picow/rust-toolchain.toml
+++ b/embassy/demos/picow/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2023-03-10"
+channel = "nightly-2023-04-07"
 components = [ "rust-src", "rustfmt" ]
 targets = [
     "thumbv6m-none-eabi",
diff --git a/embassy/demos/std/rust-toolchain.toml b/embassy/demos/std/rust-toolchain.toml
index 67957e6..549c093 100644
--- a/embassy/demos/std/rust-toolchain.toml
+++ b/embassy/demos/std/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2023-02-12"
+channel = "nightly-2023-04-07"
 components = [ "rust-src", "rustfmt" ]
 targets = [
     "thumbv6m-none-eabi",
diff --git a/embassy/rust-toolchain.toml b/embassy/rust-toolchain.toml
index 67957e6..549c093 100644
--- a/embassy/rust-toolchain.toml
+++ b/embassy/rust-toolchain.toml
@@ -1,7 +1,7 @@
 # Before upgrading check that everything is available on all tier1 targets here:
 # https://rust-lang.github.io/rustup-components-history
 [toolchain]
-channel = "nightly-2023-02-12"
+channel = "nightly-2023-04-07"
 components = [ "rust-src", "rustfmt" ]
 targets = [
     "thumbv6m-none-eabi",
diff --git a/testing/ci.sh b/testing/ci.sh
index c63873c..192f4a2 100755
--- a/testing/ci.sh
+++ b/testing/ci.sh
@@ -14,7 +14,7 @@ mkdir -p ci_out
 OUT="$(realpath ci_out)"
 
 # disabled for now, doesn't like unstable features
-export RUSTDOCFLAGS='-D warnings'
+#export RUSTDOCFLAGS='-D warnings'
 
 # dependencies
 which cargo-bloat > /dev/null || cargo install cargo-bloat
@@ -22,20 +22,22 @@ if [ -z "$OFFLINE" ]; then
     rustup toolchain add nightly
 fi
 
-# stable
-cargo test
+# stable - disabled now due to async fn in Behaviour
+#cargo test
 # build non-testing, will be no_std
-cargo build
+#cargo build
+cargo +nightly build
 # nightly
 cargo +nightly test
-cargo doc
-cargo test --doc
+
+cargo +nightly doc
+cargo +nightly test --doc
 
 (
 cd async
 # only test lib since some examples are broken
 cargo test --lib
-cargo build --example sshclient
+cargo build --example sunsetc
 )
 
 (
-- 
GitLab