Merge branch 'main' into renovate/all-minor-patch

GoogleCloudPlatform · Sep 18, 2024 · 3b015e6 · 3b015e6
2 parents b318a78 + 9ff4c6d
commit 3b015e6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
@@ -1,5 +1,10 @@
 assign_prs:
   - dazuma
+  - akerekes
+  - nifflets
 
 assign_issues:
   - dazuma
+  - akerekes
+  - nifflets
+
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1

diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        ruby: ["2.6", "2.7", "3.0", "3.1", "3.2"]
+        ruby: ['2.6', '2.7', '3.0', '3.1', '3.2', '3.3']
         flags: ["--only --test-unit"]
         include:
           - os: ubuntu-latest

diff --git a/lib/functions_framework/cli.rb b/lib/functions_framework/cli.rb
@@ -98,10 +98,10 @@ def parse_args argv # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
         op.on "-e", "--environment ENV", "Set the Rack environment" do |val|
           @env = val
         end
-        op.on "--min-threads NUM", "Set the minimum threead pool size" do |val|
+        op.on "--min-threads NUM", "Set the minimum thread pool size" do |val|
           @min_threads = val
         end
-        op.on "--max-threads NUM", "Set the maximum threead pool size" do |val|
+        op.on "--max-threads NUM", "Set the maximum thread pool size" do |val|
           @max_threads = val
         end
         op.on "--[no-]detailed-errors", "Set whether to show error details" do |val|