chore: Work around issue with old uri gem in ci (#17122)

Author: dazuma

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
         include:
           - os: ubuntu-latest
             ruby: "2.7"
-            task: "--include-spec --include-yardoc --include-build"
+            task: "--include-spec"
           - os: ubuntu-latest
             ruby: "3.0"
             task: "--include-spec"
@@ -24,12 +24,12 @@ jobs:
             task: "--include-spec"
           - os: ubuntu-latest
             ruby: "3.2"
-            task: "--include-spec"
+            task: "--include-spec --include-yardoc --include-build"
           - os: macos-latest
-            ruby: "2.7"
+            ruby: "3.2"
             task: "--include-spec"
           - os: windows-latest
-            ruby: "2.7"
+            ruby: "3.2"
             task: "--include-spec"
       fail-fast: false
     runs-on: ${{ matrix.os }}
@@ -41,6 +41,8 @@ jobs:
       with:
         ruby-version: "${{ matrix.ruby }}"
     - name: Install tools
-      run: "gem install --no-document toys"
+      run: |
+        gem install --no-document toys
     - name: Test ${{ matrix.task }}
-      run: toys ci -v --only ${{ matrix.task }} --github-event-name=${{ github.event_name }} --github-event-payload=${{ github.event_path }}
+      run: |
+        toys ci -v --only ${{ matrix.task }} --github-event-name=${{ github.event_name }} --github-event-payload=${{ github.event_path }}

.github/workflows/generate-updates.yml

@@ -16,12 +16,13 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
       - name: Install tools
-        run: "gem install --no-document toys"
+        run: |
+          gem install --no-document toys
       - name: execute
         run: |
           toys generate-updates -v --fork ${{ github.event.inputs.args }}

.github/workflows/release-please.yml

@@ -19,16 +19,17 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: Install Ruby 3.0
+      - name: Install Ruby 3.2
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.0"
+          ruby-version: "3.2"
       - name: Install NodeJS 16.x
         uses: actions/setup-node@v2
         with:
           node-version: "16.x"
       - name: Install tools
-        run: "gem install --no-document toys"
+        run: |
+          gem install --no-document toys
       - name: execute
         run: |
           toys release manifest -v \

.github/workflows/weekly-generate-updates.yml

@@ -18,7 +18,8 @@ jobs:
         with:
           ruby-version: "3.0"
       - name: Install tools
-        run: "gem install --no-document toys"
+        run: |
+          gem install --no-document toys
       - name: Execute
         run: |
           toys generate-updates -v --fork --all --clean

.toys/_nested.rb

@@ -13,6 +13,8 @@
 # limitations under the License.
 
 require "pathname"
+require "uri"
+
 base_dir = Pathname.new context_directory
 cur_dir = Pathname.new Dir.getwd
 unless base_dir == cur_dir

.toys/ci.rb

@@ -105,7 +105,7 @@ def find_changed_files base_sha
       exec(["git", "fetch", "--depth=1", "origin", base_sha])
       base_sha = capture(["git", "show", "--no-patch", "--format=%H", base_sha]).strip
     else
-      base_sha = result.captured_out
+      base_sha = result.captured_out.strip
     end
     capture(["git", "diff", "--name-only", base_sha]).split("\n").map(&:strip)
   end