Skip to content

Commit 203fe31

Browse files
committed
Fix rubocop complaint; Bump actions Ubuntu version
1 parent ec84213 commit 203fe31

9 files changed

+21
-21
lines changed

.github/workflows/build_rpi3.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
jobs:
2222
build:
2323
name: Build kernels
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v2
28-
- name: Set up Ruby 2.x
27+
- uses: actions/checkout@v3
28+
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
- name: Set up Rust nightly
3131
run: |

.github/workflows/build_rpi4.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
jobs:
2222
build:
2323
name: Build kernels
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v2
28-
- name: Set up Ruby 2.x
27+
- uses: actions/checkout@v3
28+
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
- name: Set up Rust nightly
3131
run: |

.github/workflows/sanity.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ on:
1111
jobs:
1212
build:
1313
name: Various Sanity Checks
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1515

1616
steps:
17-
- uses: actions/checkout@v2
17+
- uses: actions/checkout@v3
1818
- name: Set up Node
1919
uses: actions/setup-node@v1
2020
with:
2121
node-version: "12"
22-
- name: Set up Ruby 2.x
22+
- name: Set up Ruby
2323
uses: ruby/setup-ruby@v1
2424
- name: Set up Rust nightly
2525
run: |

.github/workflows/test_integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
jobs:
2222
build:
2323
name: Run integration tests
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v2
28-
- name: Set up Ruby 2.x
27+
- uses: actions/checkout@v3
28+
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
- name: Set up Rust nightly
3131
run: |

.github/workflows/test_unit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
jobs:
2222
build:
2323
name: Run boot and unit tests
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v2
28-
- name: Set up Ruby 2.x
27+
- uses: actions/checkout@v3
28+
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
- name: Set up Rust nightly
3131
run: |

.github/workflows/test_xtra.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
jobs:
2222
build:
2323
name: Run xtra tests
24-
runs-on: ubuntu-20.04
24+
runs-on: ubuntu-22.04
2525

2626
steps:
27-
- uses: actions/checkout@v2
28-
- name: Set up Ruby 2.x
27+
- uses: actions/checkout@v3
28+
- name: Set up Ruby
2929
uses: ruby/setup-ruby@v1
3030
- name: Set up Rust nightly
3131
run: |

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ group :uart do
1111
end
1212

1313
group :development do
14-
gem 'rubocop', '>= 1.4.1', require: false
14+
gem 'rubocop', '>= 1.37.1', require: false
1515
end

contributor_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ then
1010
echo "'bundle' could not be found. Please install Ruby and Bundler."
1111
exit
1212
fi
13-
bundle config set path '.vendor/bundle'
13+
bundle config set --local path '.vendor/bundle'
1414
bundle install
1515

1616
#

utils/devtool.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def initialize
108108
@user_has_supplied_crates = false
109109
@bsp = bsp_from_env || SUPPORTED_BSPS.first
110110

111-
cl = user_supplied_crate_list || Dir['*/Cargo.toml'].sort
111+
cl = user_supplied_crate_list || Dir['*/Cargo.toml']
112112
@crates = cl.map { |c| TutorialCrate.new(c.delete_suffix('/Cargo.toml')) }
113113
end
114114

0 commit comments

Comments
 (0)