From c1a74265153bd528024993c4c3b693231b9b5321 Mon Sep 17 00:00:00 2001
From: Julien Enoch <julien.enoch@adlinktech.com>
Date: Mon, 15 Mar 2021 09:37:19 +0100
Subject: [PATCH 1/3] Fix test in config.sh for bash not supporting -v option

---
 config.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.sh b/config.sh
index bcc51f4a..3584cd5a 100755
--- a/config.sh
+++ b/config.sh
@@ -18,7 +18,7 @@ case "${unameOut}" in
     *)          target=Other
 esac
 
-if [[ -v CYCLONE_INCLUDE ]] && [[ -v CYCLONE_LIB ]]; then
+if [[ "$CYCLONE_INCLUDE" ]] && [[ "$CYCLONE_LIB" ]]; then
     echo "Looking for Cyclone installation at: $CYCLONE_ROOT"
     if [ ! -e $CYCLONE_INCLUDE/dds/ddsc/dds_public_impl.h  ]; then
 	echo "Could not find cyclone installation at $CYCLONE_ROOT"

From 1b66ea9ac7cda84b93e9e84d9489d58aa5c1f86e Mon Sep 17 00:00:00 2001
From: Julien Enoch <julien.enoch@adlinktech.com>
Date: Mon, 15 Mar 2021 09:38:37 +0100
Subject: [PATCH 2/3] Update README to no longer build with '+nightly' as
 rust-toolchain is used

---
 .github/workflows/rust.yml | 4 +---
 README.md                  | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 0fa050b7..2ca85296 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -53,11 +53,9 @@ jobs:
         cmake ..
         sudo cmake --build . --target install
 
-    - name: Install latest nightly
+    - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
-          toolchain: nightly
-          override: true
           components: rustfmt, clippy
 
     - uses: actions/checkout@v2
diff --git a/README.md b/README.md
index a37a52aa..099ea161 100644
--- a/README.md
+++ b/README.md
@@ -40,10 +40,6 @@ In order to get running with the DDS plugin for zenoh you need first to install
 - [CMake](https://cmake.org/download/)
 - Your favourite C/C++ Compiler
 - [Rust](https://www.rust-lang.org/tools/install)
-  - Rust nightly is currently required. Once initial Rust setup is finished via rustup, install nightly:
-  - ```
-    rustup install nightly
-    ```
 
 Once these dependencies are in place, simply do:
 
@@ -51,7 +47,7 @@ Once these dependencies are in place, simply do:
 $ git clone https://github.com/eclipse-zenoh/zenoh-plugin-dds.git
 $ cd zenoh-plugin-dds
 $ ./config.sh
-$ cargo +nightly build --release --all-targets
+$ cargo build --release --all-targets
 ```
 
 Assuming you want to try this with ROS2, then install it by following the instructions available [here](https://index.ros.org/doc/ros2/Installation/Foxy/).

From 5ee94c353d69ad74e71a9ac4dd07890ea36d3fa6 Mon Sep 17 00:00:00 2001
From: Julien Enoch <julien.enoch@adlinktech.com>
Date: Mon, 15 Mar 2021 10:59:28 +0100
Subject: [PATCH 3/3] Fix CI: checkout before actions-rs/toolchain

---
 .github/workflows/rust.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 2ca85296..095d317a 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -53,12 +53,13 @@ jobs:
         cmake ..
         sudo cmake --build . --target install
 
+    - uses: actions/checkout@v2
+
     - name: Install Rust
       uses: actions-rs/toolchain@v1
       with:
           components: rustfmt, clippy
 
-    - uses: actions/checkout@v2
 
     - name: Run cargo check
       uses: actions-rs/cargo@v1