From 203fe318d4985ef139900175b5ff2ddffa6a6387 Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Tue, 25 Oct 2022 08:37:35 +0200
Subject: [PATCH] Fix rubocop complaint; Bump actions Ubuntu version

---
 .github/workflows/build_rpi3.yml       | 6 +++---
 .github/workflows/build_rpi4.yml       | 6 +++---
 .github/workflows/sanity.yml           | 6 +++---
 .github/workflows/test_integration.yml | 6 +++---
 .github/workflows/test_unit.yml        | 6 +++---
 .github/workflows/test_xtra.yml        | 6 +++---
 Gemfile                                | 2 +-
 contributor_setup.sh                   | 2 +-
 utils/devtool.rb                       | 2 +-
 9 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/build_rpi3.yml b/.github/workflows/build_rpi3.yml
index d974eebf..acdea068 100644
--- a/.github/workflows/build_rpi3.yml
+++ b/.github/workflows/build_rpi3.yml
@@ -21,11 +21,11 @@ on:
 jobs:
   build:
     name: Build kernels
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.x
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/.github/workflows/build_rpi4.yml b/.github/workflows/build_rpi4.yml
index 68de1dc1..c511f7bc 100644
--- a/.github/workflows/build_rpi4.yml
+++ b/.github/workflows/build_rpi4.yml
@@ -21,11 +21,11 @@ on:
 jobs:
   build:
     name: Build kernels
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.x
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index a42198d7..9441e3c9 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -11,15 +11,15 @@ on:
 jobs:
   build:
     name: Various Sanity Checks
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Node
         uses: actions/setup-node@v1
         with:
           node-version: "12"
-      - name: Set up Ruby 2.x
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/.github/workflows/test_integration.yml b/.github/workflows/test_integration.yml
index 954d6432..f2980039 100644
--- a/.github/workflows/test_integration.yml
+++ b/.github/workflows/test_integration.yml
@@ -21,11 +21,11 @@ on:
 jobs:
   build:
     name: Run integration tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.x
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/.github/workflows/test_unit.yml b/.github/workflows/test_unit.yml
index 02de1b84..909bde35 100644
--- a/.github/workflows/test_unit.yml
+++ b/.github/workflows/test_unit.yml
@@ -21,11 +21,11 @@ on:
 jobs:
   build:
     name: Run boot and unit tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.x
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/.github/workflows/test_xtra.yml b/.github/workflows/test_xtra.yml
index a330ef74..f77c8da1 100644
--- a/.github/workflows/test_xtra.yml
+++ b/.github/workflows/test_xtra.yml
@@ -21,11 +21,11 @@ on:
 jobs:
   build:
     name: Run xtra tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby 2.x
+      - uses: actions/checkout@v3
+      - name: Set up Ruby
         uses: ruby/setup-ruby@v1
       - name: Set up Rust nightly
         run: |
diff --git a/Gemfile b/Gemfile
index 7ac3b89e..48256484 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,5 +11,5 @@ group :uart do
 end
 
 group :development do
-    gem 'rubocop', '>= 1.4.1', require: false
+    gem 'rubocop', '>= 1.37.1', require: false
 end
diff --git a/contributor_setup.sh b/contributor_setup.sh
index 8348b4d7..26a4059e 100755
--- a/contributor_setup.sh
+++ b/contributor_setup.sh
@@ -10,7 +10,7 @@ then
     echo "'bundle' could not be found. Please install Ruby and Bundler."
     exit
 fi
-bundle config set path '.vendor/bundle'
+bundle config set --local path '.vendor/bundle'
 bundle install
 
 #
diff --git a/utils/devtool.rb b/utils/devtool.rb
index 47141c1d..fdbcf3a5 100755
--- a/utils/devtool.rb
+++ b/utils/devtool.rb
@@ -108,7 +108,7 @@ class DevTool
         @user_has_supplied_crates = false
         @bsp = bsp_from_env || SUPPORTED_BSPS.first
 
-        cl = user_supplied_crate_list || Dir['*/Cargo.toml'].sort
+        cl = user_supplied_crate_list || Dir['*/Cargo.toml']
         @crates = cl.map { |c| TutorialCrate.new(c.delete_suffix('/Cargo.toml')) }
     end