From 7162e34c1b2d9e4cb85263bb27f9594f50f17eaa Mon Sep 17 00:00:00 2001 From: Robb Kidd Date: Wed, 8 May 2024 15:01:23 -0400 Subject: [PATCH] chore: bump ruby/setup-ruby from 1.165.1 to 1.176.0 (#1635) * chore: bump ruby/setup-ruby from 1.165.1 to 1.176.0 To fix an error[1] on macos runners resolved in v1.171.0[2]: The current runner (macos-14-arm64) was detected as self-hosted because the platform does not match a GitHub-hosted runner image (or that imageis deprecated and no longer supported). [1] https://github.com/ruby/setup-ruby/issues/568 [2] https://github.com/ruby/setup-ruby/pull/567 * resolve missing constant error in Ruby 3.3.1 --- .github/actions/test_gem/action.yml | 4 ++-- .github/workflows/release-hook-on-closed.yml | 2 +- .github/workflows/release-hook-on-push.yml | 2 +- .github/workflows/release-perform.yml | 2 +- .github/workflows/release-request.yml | 2 +- .github/workflows/release-retry.yml | 2 +- common/lib/opentelemetry/common/utilities.rb | 2 ++ 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/actions/test_gem/action.yml b/.github/actions/test_gem/action.yml index fee7aa56cd..38b77c7609 100644 --- a/.github/actions/test_gem/action.yml +++ b/.github/actions/test_gem/action.yml @@ -58,7 +58,7 @@ runs: # ...but not for appraisals, sadly. - name: Install Ruby ${{ inputs.ruby }} with dependencies if: "${{ steps.setup.outputs.appraisals == 'false' }}" - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: "${{ inputs.ruby }}" working-directory: "${{ steps.setup.outputs.gem_dir }}" @@ -69,7 +69,7 @@ runs: # If we're using appraisals, do it all manually. - name: Install Ruby ${{ inputs.ruby }} without dependencies if: "${{ steps.setup.outputs.appraisals == 'true' }}" - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: "${{ inputs.ruby }}" bundler: "latest" diff --git a/.github/workflows/release-hook-on-closed.yml b/.github/workflows/release-hook-on-closed.yml index ea3f3fbd12..e6c98e7b02 100644 --- a/.github/workflows/release-hook-on-closed.yml +++ b/.github/workflows/release-hook-on-closed.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-hook-on-push.yml b/.github/workflows/release-hook-on-push.yml index 3b85109a7d..96b780d26b 100644 --- a/.github/workflows/release-hook-on-push.yml +++ b/.github/workflows/release-hook-on-push.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-perform.yml b/.github/workflows/release-perform.yml index e634cd3f9c..36e49facff 100644 --- a/.github/workflows/release-perform.yml +++ b/.github/workflows/release-perform.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-request.yml b/.github/workflows/release-request.yml index d67826602c..69584c952c 100644 --- a/.github/workflows/release-request.yml +++ b/.github/workflows/release-request.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/.github/workflows/release-retry.yml b/.github/workflows/release-retry.yml index f859a865d8..cb02dfb0de 100644 --- a/.github/workflows/release-retry.yml +++ b/.github/workflows/release-retry.yml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Ruby ${{ env.ruby_version }} - uses: ruby/setup-ruby@v1.165.1 + uses: ruby/setup-ruby@v1.176.0 with: ruby-version: ${{ env.ruby_version }} - name: Checkout repo diff --git a/common/lib/opentelemetry/common/utilities.rb b/common/lib/opentelemetry/common/utilities.rb index 8667a6fd94..eee275f253 100644 --- a/common/lib/opentelemetry/common/utilities.rb +++ b/common/lib/opentelemetry/common/utilities.rb @@ -4,6 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 +require 'uri' + module OpenTelemetry module Common # Utilities contains common helpers.