Install rbs globally

ruby · Jan 24, 2024 · f373f98 · f373f98
1 parent 8ac2feb
commit f373f98
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -32,6 +32,8 @@ jobs:
       with:
         ruby-version: '3.2'
         bundler-cache: true
+    - name: Run bin/setup
+      run: bin/setup
     - name: Get changed gems
       id: changes
       run: |
@@ -62,5 +64,7 @@ jobs:
       with:
         ruby-version: '3.2'
         bundler-cache: true
+    - name: Run bin/setup
+      run: bin/setup
     - name: Run test on all gems
       run: bin/test --all --verbose
diff --git a/bin/setup b/bin/setup
@@ -6,3 +6,4 @@ set -v
 ROOT_DIR=$(cd $(dirname $0)/..; pwd)
 
 bundle install --gemfile=${ROOT_DIR}/Gemfile
+gem install rbs:$(bundle exec gem list rbs | ruby -e 'puts gets[/([0-9.]+)/, 1]')
diff --git a/bin/test b/bin/test
@@ -49,7 +49,6 @@ class Runner
     @test_dir = base_dir / "_test"
     @version = base_dir.basename.to_s
     @gem_name = base_dir.parent.basename.to_s
-    @rbs_command = `bundle exec which rbs`.chomp
   end
 
   def run
@@ -69,7 +68,7 @@ class Runner
 
   private
 
-  attr_reader :base_dir, :test_dir, :version, :gem_name, :rbs_command
+  attr_reader :base_dir, :test_dir, :version, :gem_name
 
   def generate_gemfile_lock
     v = "~> #{version}"
@@ -96,7 +95,7 @@ class Runner
   end
 
   def rbs_collection_install
-    sh! rbs_command, 'collection', 'install', chdir: test_dir.to_s
+    sh! 'rbs', 'collection', 'install', chdir: test_dir.to_s
   end
 
   def remove_gemfile_lock
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,3 +6,4 @@ set -v
		ROOT_DIR=$(cd $(dirname $0)/..; pwd)

		bundle install --gemfile=${ROOT_DIR}/Gemfile
		gem install rbs:$(bundle exec gem list rbs \| ruby -e 'puts gets[/([0-9.]+)/, 1]')