rbs 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ed8a96159c84845024315376ce0a5958f922284e80ef132869855f6e75435be
-  data.tar.gz: 5c8fb66eea12d424011dc09f7fe3cad9776226c75585ac467d274a4fea690fe4
+  metadata.gz: 301b01da51da79779b05bf679f63123f36ee648e1b8cde73892ee46e1cbaf75b
+  data.tar.gz: 19c0405e755b937ffe785b5c4802886e8fd8049c5144006988a82b0e07816777
 SHA512:
-  metadata.gz: b6a92c7503a20f85d596571559da7f380ed4a1109b1ce23bcb2394c549cf0930d5a9b32942d6ce1f31be4e9b9f04c653d518459e3b2d5cffb8ed445b97ce74cc
-  data.tar.gz: 99baedc9a8b80a744d06f3ef8819143bc1712dfdc6f8f315b0f10491103b3b2147105861c346f9630d75283ae795dba051deb3b0fd6c2dcce98fd18d476ed144
+  metadata.gz: 00ca6d33062fcfcd806f1e8aa0953b028c2422ab8eb591ed1c444ab778040141007c41e99662ef5e4d7a4f989d4e8c26360c3c95ae9e0dfad2464213e6009714
+  data.tar.gz: e4ad050b7520e5177a74af2540ae589b648f108b3de7016ae3bb6440d9ccf4f4961423e5f50f9756171b5f754f6552f6c1aff30019e21b357e309d8927fcd0e6

data/.github/workflows/comments.yml

@@ -8,18 +8,20 @@ on:
   merge_group: {}
 
 jobs:
-  test:
+  comments:
     runs-on: "ubuntu-latest"
-    container:
-      image: rubylang/ruby:3.2-dev-focal
-    env:
-      RUBY_COMMIT: v3_3_0
+    # env:
+    #   RUBY_COMMIT: v3_3_0
     steps:
       - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler: none
       - name: Install dependencies
         run: |
-          apt-get update
-          apt-get install -y libdb-dev curl
+          sudo apt-get update
+          sudo apt-get install -y libdb-dev curl
       - name: Update rubygems & bundler
         run: |
           ruby -v

data/.github/workflows/ruby.yml

@@ -13,38 +13,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container_tag:
-          - master-nightly-focal
-          - 3.2-dev-focal
-          - 3.1-dev-focal
-          - 3.0-dev-focal
+        ruby: ['3.0', '3.1', '3.2', '3.3', head]
         job:
           - test
-          - stdlib_test
-          - rubocop validate test_doc build test_generate_stdlib
-          - lexer confirm_lexer
-          - lexer compile
-        exclude:
-          - container_tag: master-nightly-focal
-            job: confirm_lexer
-          - container_tag: 3.0-dev-focal
+        include:
+          - ruby: head
+            job: stdlib_test rubocop
+          - ruby: "3.3"
             job: stdlib_test
-          - container_tag: 3.1-dev-focal
-            job: stdlib_test
-          - container_tag: 3.2-dev-focal
-            job: stdlib_test
-    container:
-      image: rubylang/ruby:${{ matrix.container_tag }}
+          - ruby: "3.3"
+            job: lexer compile confirm_lexer
+          - ruby: "3.3"
+            job: rubocop validate test_doc build test_generate_stdlib
     steps:
       - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
       - name: Install dependencies
         run: |
-          apt-get update
-          apt-get install -y libdb-dev curl autoconf automake m4 libtool python3
+          sudo apt-get update
+          sudo apt-get install -y libdb-dev curl autoconf automake m4 libtool python3
       - name: Install Re2c
-        if: contains(matrix.job, 'lexer')
+        if: ${{ contains(matrix.job, 'lexer') }}
         run: |
           cd /tmp
           curl -L https://github.com/skvadrik/re2c/archive/refs/tags/3.1.tar.gz > re2c-3.1.tar.gz
@@ -53,7 +47,7 @@ jobs:
           autoreconf -i -W all
           ./configure
           make
-          make install
+          sudo make install
       - name: Update rubygems & bundler
         run: |
           ruby -v
@@ -62,14 +56,13 @@ jobs:
         run: |
           echo "NO_MINITEST=true" >> $GITHUB_ENV
           bundle config set --local without 'minitest'
-        if: ${{ contains(matrix.container_tag, 'master-nightly') }}
+        if: ${{ contains(matrix.ruby, 'head') }}
       - name: bin/setup
         run: |
           bin/setup
       - name: Run test
         run: |
           bundle exec rake ${{ matrix.job }}
-        continue-on-error: ${{ matrix.allow_failures == 'true' && (github.event_name == 'push' || github.event_name == 'merge_group') }}
 
   windows:
     runs-on: ${{ matrix.os }}

data/.github/workflows/typecheck.yml

@@ -8,23 +8,22 @@ on:
   merge_group: {}
 
 jobs:
-  test:
+  steep:
     runs-on: "ubuntu-latest"
     strategy:
       fail-fast: false
-      matrix:
-        container_tag:
-          - 3.2-dev-focal
-    container:
-      image: rubylang/ruby:${{ matrix.container_tag }}
     steps:
       - uses: actions/checkout@v4
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.3"
+          bundler: none
       - name: Set working directory as safe
         run: git config --global --add safe.directory $(pwd)
       - name: Install dependencies
         run: |
-          apt-get update
-          apt-get install -y libdb-dev curl autoconf automake m4 libtool
+          sudo apt-get update
+          sudo apt-get install -y libdb-dev curl
       - name: Update rubygems & bundler
         run: |
           ruby -v

data/CHANGELOG.md

@@ -2,11 +2,19 @@
 
 ## master
 
+## 3.4.3 (2024-01-25)
+
+### Library changes
+
+#### rbs collection
+
+* Backport [#1731](https://github.com/ruby/rbs/pull/1731) ([#1735](https://github.com/ruby/rbs/pull/1735))
+
 ## 3.4.2 (2024-01-19)
 
 ### Miscellaneous
 
-* Bckport #1724 ([#1726](https://github.com/ruby/rbs/pull/1726))
+* Backport [#1724](https://github.com/ruby/rbs/pull/1724) ([#1726](https://github.com/ruby/rbs/pull/1726))
 
 ## 3.4.1 (2023-12-26)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbs (3.4.2)
+    rbs (3.4.3)
       abbrev
 
 PATH

data/lib/rbs/environment_loader.rb

@@ -82,7 +82,21 @@ module RBS
       repository.add(lockfile.fullpath)
 
       lockfile.gems.each_value do |gem|
-        add(library: gem[:name], version: gem[:version], resolve_dependencies: false)
+        name = gem[:name]
+        locked_version = gem[:version]
+
+        if (source = gem[:source]).is_a?(Collection::Sources::Rubygems)
+          # allow loading different version of a gem
+
+          unless source.has?(name, locked_version)
+            if (spec, _ = self.class.gem_sig_path(name, nil))
+              RBS.logger.warn { "Loading type definition from gem `#{name}-#{spec.version}` because locked version `#{locked_version}` is unavailable. Try `rbs collection update` to fix the (potential) issue." }
+              locked_version = spec.version.to_s
+            end
+          end
+        end
+
+        add(library: gem[:name], version: locked_version, resolve_dependencies: false)
       end
     end
 

data/lib/rbs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RBS
-  VERSION = "3.4.2"
+  VERSION = "3.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-19 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abbrev