Skip to content

Commit db2b065

Browse files
authored
chore: Attempt to fix bundle in regen job (#17139)
1 parent 98ed3d5 commit db2b065

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
steps:
1414
- name: Checkout repo
1515
uses: actions/checkout@v2
16-
- name: Install Ruby 3.0
16+
- name: Install Ruby 3.2
1717
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: "3.0"
19+
ruby-version: "3.2"
2020
- name: Install tools
2121
run: |
2222
gem install --no-document toys

.toys/generate-updates.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
desc "Requested apis in api:version format"
3838
end
3939

40-
include :bundler, gemfile_path: "#{context_directory}/google-apis-generator/Gemfile"
4140
include :exec, e: true
4241
include :git_cache
4342
include :terminal
@@ -55,6 +54,7 @@ def run
5554

5655
@errors = []
5756
@timestamp = Time.now.utc.strftime("%Y%m%d-%H%M%S")
57+
bundle_generator
5858
apis_versions = list_apis_versions
5959
apis_versions.each_with_index do |(api, version), index|
6060
pr_single_gem api, version, index + 1, apis_versions.size
@@ -144,6 +144,7 @@ def open_pr_exists? title
144144
def regen_single_gem api, version
145145
Dir.chdir "#{context_directory}/google-apis-generator" do
146146
cmd = [
147+
"bundle", "exec",
147148
"bin/generate-api", "gen",
148149
"#{context_directory}/generated",
149150
"--api=#{api}.#{version}",
@@ -159,6 +160,7 @@ def regen_single_gem api, version
159160
def clean_old_gems
160161
Dir.chdir "#{context_directory}/google-apis-generator" do
161162
cmd = [
163+
"bundle", "exec",
162164
"bin/generate-api", "gen",
163165
"#{context_directory}/generated",
164166
"--clean"
@@ -167,3 +169,9 @@ def clean_old_gems
167169
yoshi_pr_generator.abort_capture! unless result.success?
168170
end
169171
end
172+
173+
def bundle_generator
174+
Dir.chdir "#{context_directory}/google-apis-generator" do
175+
exec ["bundle", "install"]
176+
end
177+
end

0 commit comments

Comments
 (0)