From 50b2433fb51bd67983c8251d0a0825e9e22a078d Mon Sep 17 00:00:00 2001
From: ivmarkov <ivan.markov@gmail.com>
Date: Sat, 22 Jul 2023 17:54:40 +0000
Subject: [PATCH] Address review feedback

---
 .github/workflows/ci-tlv-tool.yml    | 11 +++++++----
 .github/workflows/ci.yml             | 14 +++++++-------
 .github/workflows/publish-macros.yml |  2 +-
 .github/workflows/publish.yml        |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci-tlv-tool.yml b/.github/workflows/ci-tlv-tool.yml
index 287e6bc..fbe3a68 100644
--- a/.github/workflows/ci-tlv-tool.yml
+++ b/.github/workflows/ci-tlv-tool.yml
@@ -18,16 +18,19 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Fmt
-        run: cd tools/tlv; cargo fmt -- --check
+        run: cargo fmt -- --check
+        working-directory: tools/tlv
 
       - name: Clippy
-        run: cd tools/tlv; cargo clippy --no-deps -- -Dwarnings
+        run: cargo clippy --no-deps -- -Dwarnings
+        working-directory: tools/tlv
 
       - name: Build
-        run: cd tools/tlv; cargo build
+        run: cargo build
+        working-directory: tools/tlv
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b537a7d..57a9ce9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 env:
-  rust_toolchain: nightly-2023-07-01
+  RUST_TOOLCHAIN: nightly-2023-07-01
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   CARGO_TERM_COLOR: always
 
@@ -28,21 +28,21 @@ jobs:
         if: matrix.toolchain == 'nightly'
         uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: ${{ env.rust_toolchain }}
+          toolchain: ${{ env.RUST_TOOLCHAIN }}
           components: rustfmt, clippy, rust-src
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Fmt
-        run: cargo +${{ matrix.toolchain == 'nightly' && env.rust_toolchain || 'stable'}} fmt -- --check
+        run: cargo +${{ matrix.toolchain == 'nightly' && env.RUST_TOOLCHAIN || 'stable'}} fmt -- --check
 
       - name: Clippy
-        run: cargo +${{ matrix.toolchain == 'nightly' && env.rust_toolchain || 'stable'}} clippy --no-deps --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}} -- -Dwarnings
+        run: cargo +${{ matrix.toolchain == 'nightly' && env.RUST_TOOLCHAIN || 'stable'}} clippy --no-deps --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}} -- -Dwarnings
 
       - name: Build
-        run: cargo +${{ matrix.toolchain == 'nightly' && env.rust_toolchain || 'stable'}} build --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}}
+        run: cargo +${{ matrix.toolchain == 'nightly' && env.RUST_TOOLCHAIN || 'stable'}} build --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}}
 
       - name: Test
         if: matrix.features == 'os'
-        run: cargo +${{ matrix.toolchain == 'nightly' && env.rust_toolchain || 'stable'}} test --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}} -- --test-threads=1
+        run: cargo +${{ matrix.toolchain == 'nightly' && env.RUST_TOOLCHAIN || 'stable'}} test --no-default-features --features ${{matrix.crypto-backend}},${{matrix.features}},${{ matrix.toolchain == 'nightly' && 'nightly' || ''}} -- --test-threads=1
diff --git a/.github/workflows/publish-macros.yml b/.github/workflows/publish-macros.yml
index 684b90c..9ba9701 100644
--- a/.github/workflows/publish-macros.yml
+++ b/.github/workflows/publish-macros.yml
@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Login
-        run: cargo login ${{ secrets.crates_io_token }}
+        run: cargo login ${{ secrets.CRATES_IO_TOKEN }}
 
       - name: Publish-Macros
         run: cargo publish -p rs-matter-macros
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index a678a26..a8b09ee 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Login
-        run: cargo login ${{ secrets.crates_io_token }}
+        run: cargo login ${{ secrets.CRATES_IO_TOKEN }}
 
       - name: Publish
         run: cargo publish -p rs-matter