Adding shell linting + fixing check-version-matches.rb

SUSE · Feb 6, 2024 · 212be22 · 212be22
1 parent 2ba89d1
commit 212be22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/lint-unit.yml b/.github/workflows/lint-unit.yml
@@ -38,9 +38,7 @@ jobs:
           --health-retries=3
 
     steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -53,6 +51,11 @@ jobs:
           sudo mkdir -p /var/lib/rmt
           ruby -e "require 'yaml'; puts({'database_test'=>{'host' => '127.0.0.1', 'port' => 3306, 'username'=>'rmt','password'=>'rmt','database'=>'rmt_test','adapter'=>'mysql2','encoding'=>'utf8','timeout'=>5000,'pool'=>5}}.to_yaml)" > config/rmt.local.yml
 
+      - name: Run Shell lint
+        uses: azohra/shell-linter@latest
+        with:
+          path: "ci/rmt-*"
+
       - name: Run Lint
         run: |
           bundle exec rubocop -D

diff --git a/ci/check-version-matches.rb b/ci/check-version-matches.rb
@@ -15,10 +15,7 @@ def spec_version
 end
 
 def rmt_version
-  @rmt_version ||= (require_relative 'lib/rmt' and RMT::VERSION)
-
-  require_relative '../lib/rmt'
-  @rmt_version = RMT::VERSION
+  @rmt_version ||= (require_relative '../lib/rmt' and RMT::VERSION)
 end
 
 def failure(msg)