diff --git a/.toys/ci.rb b/.toys/ci.rb index ace2833ef7f..10a29a60a2a 100644 --- a/.toys/ci.rb +++ b/.toys/ci.rb @@ -130,7 +130,7 @@ def find_changed_directories files when %r{^(generated/[^/]+)/} dirs << Regexp.last_match[1] when %r{^google-apis-core/} - dirs << "google-apis-core" << "generated/google-apis-discovery_v1" + dirs << "google-apis-core" << "generated/google-apis-discovery_v1" << "google-apis-generator" when %r{^google-apis-generator/} dirs << "google-apis-generator" end diff --git a/.toys/generate-updates.rb b/.toys/generate-updates.rb index a92e06438af..ea28f82eb0b 100644 --- a/.toys/generate-updates.rb +++ b/.toys/generate-updates.rb @@ -193,6 +193,7 @@ def regen_single_gem api, version "--verbose" ] result = exec cmd, in: [:string, "a\n"], out: [:capture, :inherit], err: [:capture, :inherit], e: false + exec ["git", "checkout", "--", "Gemfile.lock"] unless result.success? err_detail = result.captured_err.to_s.strip err_detail = result.captured_out.to_s.strip if err_detail.empty? @@ -215,6 +216,7 @@ def clean_old_gems "--verbose" ] result = exec cmd, out: [:capture, :inherit], err: [:capture, :inherit], e: false + exec ["git", "checkout", "--", "Gemfile.lock"] unless result.success? err_detail = result.captured_err.to_s.strip err_detail = result.captured_out.to_s.strip if err_detail.empty? @@ -227,7 +229,39 @@ def clean_old_gems end def bundle_generator - Dir.chdir "#{context_directory}/google-apis-generator" do - exec ["bundle", "install"] + branch_name = "gen/generator-lockfile-#{@timestamp}" + commit_message = "chore(generator): refresh Gemfile.lock" + if git_remote && open_pr_exists?(commit_message) + puts "Pull request already exists for refreshing google-apis-generator/Gemfile.lock", :yellow + Dir.chdir "#{context_directory}/google-apis-generator" do + exec ["bundle", "install"] + exec ["git", "checkout", "--", "Gemfile.lock"] + end + return + end + approval_message = approval_token ? "Rubber-stamped generator lockfile refresh!" : nil + labels = approval_token ? ["automerge"] : nil + result = yoshi_pr_generator.capture enabled: !git_remote.nil?, + remote: git_remote, + branch_name: branch_name, + commit_message: commit_message, + labels: labels, + auto_approve: approval_message, + approval_token: approval_token do + Dir.chdir "#{context_directory}/google-apis-generator" do + exec ["bundle", "install"] + exec ["git", "checkout", "--", "Gemfile.lock"] unless git_remote + end + end + case result + when Integer + puts "Opened pull request #{result} for refreshing google-apis-generator/Gemfile.lock", :green, :bold + when :unchanged + puts "No changes for google-apis-generator/Gemfile.lock", :magenta + when :aborted + puts "Error when refreshing google-apis-generator/Gemfile.lock", :red, :bold + @errors << "google-apis-generator/Gemfile.lock" + else + puts "Installed bundle for google-apis-generator", :cyan end end diff --git a/google-apis-generator/Gemfile.lock b/google-apis-generator/Gemfile.lock index b77e5c016b3..0f35cfb1960 100644 --- a/google-apis-generator/Gemfile.lock +++ b/google-apis-generator/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: ../google-apis-core specs: - google-apis-core (1.4.0) + google-apis-core (1.4.1) addressable (~> 2.9) faraday (~> 2.13) faraday-follow_redirects (~> 0.3) @@ -9,12 +9,12 @@ PATH mini_mime (~> 1.1) multi_json (~> 1.21, >= 1.21.2) representable (~> 3.3, >= 3.3.1) - retriable (>= 3.1, < 5.0) + retriable (>= 3.1, < 6.0) PATH remote: . specs: - google-apis-generator (0.19.1) + google-apis-generator (0.19.3) activesupport (>= 5.0) gems (~> 1.2) google-apis-core (>= 0.15.0, < 2.a) @@ -273,9 +273,9 @@ CHECKSUMS fiddle (1.1.8) sha256=7fa8ee3627271497f3add5503acdbc3f40b32f610fc1cf49634f083ef3f32eee gems (1.3.0) sha256=37e7fb834365f39d3c2c649f0a7017288b0fe9ca69d3056b6760b53468b585ae github-markup (1.7.0) sha256=97eb27c70662d9cc1d5997cd6c99832026fae5d4913b5dce1ce6c9f65078e69d - google-apis-core (1.4.0) + google-apis-core (1.4.1) google-apis-discovery_v1 (0.21.0) sha256=fce49cb075013609485047f15e331a6db69ff42e202f154249cded2a2bfe8f3c - google-apis-generator (0.19.1) + google-apis-generator (0.19.3) google-cloud-env (2.4.0) sha256=01cb35ecee5d1c4d1cd4deaed8bb5bddc838e296bcc2a35c5d1ddd07ce40d28d google-id-token (1.4.2) sha256=d088ebe1a213a15511d4a9bf71261b1ff7ed6e8dbca52a3a71223ad03f8e69d1 google-logging-utils (0.2.0) sha256=675462b4ea5affa825a3442694ca2d75d0069455a1d0956127207498fca3df7b