Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/sync-repo-settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ branchProtectionRules:
isAdminEnforced: false
requiredStatusCheckContexts:
- 'cla/google'
- 'CI (macos-latest, 3.2, test)'
- 'CI (ubuntu-latest, 2.7, test)'
- 'CI (macos-latest, 3.3, test)'
- 'CI (ubuntu-latest, 3.0, test)'
- 'CI (ubuntu-latest, 3.1, test)'
- 'CI (ubuntu-latest, 3.2, test)'
- 'CI (ubuntu-latest, 3.2, rubocop , build , yardoc , linkinator)'
- 'CI (windows-latest, 3.2, test)'
- 'CI (ubuntu-latest, 3.3, rubocop , build , yardoc , linkinator)'
- 'CI (ubuntu-latest, 3.3, test)'
- 'CI (windows-latest, 3.3, test)'
requiredApprovingReviewCount: 1
requiresCodeOwnerReviews: true
requiresStrictStatusChecks: true
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ jobs:
strategy:
matrix:
include:
- os: ubuntu-latest
ruby: "2.7"
task: test
- os: ubuntu-latest
ruby: "3.0"
task: test
Expand All @@ -25,14 +22,17 @@ jobs:
- os: ubuntu-latest
ruby: "3.2"
task: test
- os: ubuntu-latest
ruby: "3.3"
task: test
- os: macos-latest
ruby: "3.2"
ruby: "3.3"
task: test
- os: windows-latest
ruby: "3.2"
ruby: "3.3"
task: test
- os: ubuntu-latest
ruby: "3.2"
ruby: "3.3"
task: rubocop , build , yardoc , linkinator
fail-fast: false
runs-on: ${{ matrix.os }}
Expand All @@ -43,10 +43,10 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: "${{ matrix.ruby }}"
- name: Install NodeJS 16.x
- name: Install NodeJS 18.x
uses: actions/setup-node@v4
with:
node-version: "16.x"
node-version: "18.x"
- name: Install tools
shell: bash
run: "gem install --no-document toys && bundle install"
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source "https://rubygems.org"
gemspec

gem "autotest-suffix", "~> 1.1"
gem "google-style", "~> 1.27.0"
gem "google-style", "~> 1.30.0"
gem "minitest", "~> 5.16"
gem "minitest-autotest", "~> 1.0"
gem "minitest-focus", "~> 1.1"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Metadata Server.

## Supported Ruby Versions

This library is supported on Ruby 2.7+.
This library is supported on Ruby 3.0+.

In general, Google provides official support for CRuby versions that are
actively supported by the Ruby Core team -- that is, Ruby versions that are
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-env.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.files = Dir.glob("lib/**/*.rb") + Dir.glob("*.md") + ["LICENSE", ".yardopts"]
gem.require_paths = ["lib"]

gem.required_ruby_version = ">= 2.7"
gem.required_ruby_version = ">= 3.0"

gem.add_dependency "faraday", ">= 1.0", "< 3.a"

Expand Down
6 changes: 3 additions & 3 deletions test/google/cloud/env/lazy_value_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -402,21 +402,21 @@
raise "whoops4"
end
err = assert_raises RuntimeError do
cache.await max_time: 0.55, max_tries: nil
cache.await max_time: 0.59, max_tries: nil
end
assert_equal "whoops4", err.message
assert_equal 3, count
end

it "uses the cache's retry interval" do
count = 0
retries = Google::Cloud::Env::Retries.new max_tries: 10, initial_delay: 0.1
retries = Google::Cloud::Env::Retries.new max_tries: 10, initial_delay: 0.2
cache = Google::Cloud::Env::LazyValue.new retries: retries do
count += 1
raise "whoops5"
end
err = assert_raises RuntimeError do
cache.await max_time: 0.25, max_tries: 10
cache.await max_time: 0.59, max_tries: 10
end
assert_equal "whoops5", err.message
assert_equal 3, count
Expand Down