From 710150000255170c47e3f24cbd49fd083f9b0c6d Mon Sep 17 00:00:00 2001
From: Rahix <rahix@rahix.de>
Date: Sat, 28 Aug 2021 20:08:12 +0200
Subject: [PATCH] ci: Upgrade tool versions

Reflect the latest requirements in our CI workflow as well.
---
 .github/workflows/ci.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9121031ca74279c386ff91f944820e850b20877..60a7f86a0e9a493fec406263eb782b8148e81f77 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,13 +18,7 @@ jobs:
           profile: minimal
           toolchain: stable
           override: false
-      - name: Install Nightly Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: nightly-2021-01-07
-          override: true
-          components: rustfmt
+          default: true
 
       # Python Dependencies
       - name: Install Python dependencies
@@ -40,29 +34,25 @@ jobs:
         id: cache-cargo
         with:
           path: ~/cargo-bin
-          key: rust-tools-001
+          key: rust-tools-002
       - name: Install svd2rust
         if: steps.cache-cargo.outputs.cache-hit != 'true'
-        run: |
-          mkdir svd2rust
-          cd svd2rust
-          git init
-          git remote add origin https://github.com/rust-embedded/svd2rust.git
-          git fetch origin 56be78729279eeebef65110c13be8d96c0b9270f
-          git checkout FETCH_HEAD
-          cargo +stable install --path .
+        uses: actions-rs/install@v0.1
+        with:
+          crate: svd2rust
+          version: 0.19.0
       - name: Install cargo-form
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         uses: actions-rs/install@v0.1
         with:
           crate: form
-          version: 0.7.0
+          version: 0.8.0
       - name: Install atdf2svd
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         uses: actions-rs/install@v0.1
         with:
           crate: atdf2svd
-          version: 0.2.0
+          version: 0.3.1
       - name: Copy tools to cache directory
         if: steps.cache-cargo.outputs.cache-hit != 'true'
         run: |
@@ -73,6 +63,14 @@ jobs:
       - name: Put new cargo binary directory into path
         run: echo "$HOME/cargo-bin" >> $GITHUB_PATH
 
+      - name: Install Nightly Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2021-01-07
+          override: true
+          components: rustfmt
+
       # Actual test run
       - name: Generate chip description sources
         run: make RUSTUP_TOOLCHAIN=nightly-2021-01-07