Skip to content

Commit

Permalink
Fix rubocop complaint; Bump actions Ubuntu version
Browse files Browse the repository at this point in the history
  • Loading branch information
andre-richter committed Oct 25, 2022
1 parent ec84213 commit 203fe31
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build_rpi3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_rpi4.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/sanity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test_xtra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion contributor_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

#
Expand Down
2 changes: 1 addition & 1 deletion utils/devtool.rb
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def initialize
@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

Expand Down

0 comments on commit 203fe31

Please sign in to comment.