chore(multi): A few CI fixes (#28177)

googleapis · Jan 3, 2025 · b4e2288 · b4e2288
1 parent 6f30783
commit b4e2288
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/.kokoro/continuous/samples.cfg b/.kokoro/continuous/samples.cfg
@@ -39,5 +39,5 @@ env_vars: {
 
 env_vars: {
   key: "EXTRA_CI_ARGS"
-  value: "--base=HEAD^ --max-gem-count=4 --samples-master"
+  value: "--base=HEAD^ --max-gem-count=4 --samples-main"
 }
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
@@ -39,5 +39,5 @@ env_vars: {
 
 env_vars: {
   key: "EXTRA_CI_ARGS"
-  value: "--base=main --max-gem-count=4 --samples-master"
+  value: "--base=main --max-gem-count=4 --samples-main"
 }
diff --git a/.toys/.lib/sample_loader.rb b/.toys/.lib/sample_loader.rb
@@ -121,7 +121,11 @@ def sample_class
           klass = traverse_name klass, name, type
         end
         bind = klass.class_eval { binding }
-        eval sample_text, bind, file_path rescue nil
+        begin
+          eval sample_text, bind, file_path
+        rescue StandardError, ScriptError
+          # Just fails to create whatever sample stuff is expected.
+        end
         klass
       end
     end

diff --git a/.toys/ci.rb b/.toys/ci.rb
@@ -22,7 +22,7 @@
   "linkinator",
   "acceptance",
   "conformance",
-  "samples-master",
+  "samples-main",
   "samples-latest",
 ].freeze
 OPTIONAL_TASKS = ["conformance"].freeze

diff --git a/google-cloud-datastore/lib/google/cloud/datastore/dataset.rb b/google-cloud-datastore/lib/google/cloud/datastore/dataset.rb
@@ -483,7 +483,8 @@ def run query, namespace: nil, consistency: nil, read_time: nil
         ##
         # Retrieve aggregate results specified by an AggregateQuery.
         #
-        # @param [AggregateQuery, GqlQuery] query The object with the aggregate criteria.
+        # @param [AggregateQuery, GqlQuery] aggregate_query The object with the
+        #   aggregate criteria.
         # @param [String] namespace The namespace the query is to run within.
         # @param [Symbol] consistency The non-transactional read consistency to
         #   use. Cannot be set to `:strong` for global queries. Accepted values

diff --git a/google-cloud-datastore/lib/google/cloud/datastore/read_only_transaction.rb b/google-cloud-datastore/lib/google/cloud/datastore/read_only_transaction.rb
@@ -170,7 +170,8 @@ def run query, namespace: nil
         # Retrieve aggregate query results specified by an AggregateQuery. The query is run within the
         # transaction.
         #
-        # @param [AggregateQuery, GqlQuery] query The Query object with the search criteria.
+        # @param [AggregateQuery, GqlQuery] aggregate_query The Query object
+        #   with the search criteria.
         # @param [String] namespace The namespace the query is to run within.
         #
         # @return [Google::Cloud::Datastore::Dataset::AggregateQueryResults]

diff --git a/google-cloud-error_reporting/test/google/cloud/error_reporting/middleware_test.rb b/google-cloud-error_reporting/test/google/cloud/error_reporting/middleware_test.rb
@@ -175,7 +175,7 @@ class IgnoredError < ::StandardError
     end
 
     it "calls error_reporting#report when no correct status found" do
-      stub_error_reporting = MiniTest::Mock.new
+      stub_error_reporting = Minitest::Mock.new
       stub_error_reporting.expect :report, nil do |error_event|
         _(error_event).must_be_kind_of Google::Cloud::ErrorReporting::ErrorEvent
       end