Skip to content

Commit e9b9561

Browse files
authored
Merge branch 'main' into update-ruby-version-matrix
2 parents b36f1d0 + c6d83fb commit e9b9561

File tree

9 files changed

+24
-18
lines changed

9 files changed

+24
-18
lines changed

.github/blunderbuss.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
assign_prs:
2-
- janell-chen
3-
- garethgeorge
2+
- dazuma
3+
- akerekes
4+
- nifflets
45

56
assign_issues:
6-
- janell-chen
7-
- garethgeorge
7+
- dazuma
8+
- akerekes
9+
- nifflets
10+

.github/workflows/codeql.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ jobs:
5252
uploads.github.com:443
5353
5454
- name: Checkout repository
55-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
55+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
5656

5757
# Initializes the CodeQL tools for scanning.
5858
- name: Initialize CodeQL
59-
uses: github/codeql-action/init@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
59+
uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
6060
with:
6161
languages: ${{ matrix.language }}
6262
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +66,7 @@ jobs:
6666
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6767
# If this step fails, then you should remove it and run the build manually (see below)
6868
- name: Autobuild
69-
uses: github/codeql-action/autobuild@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
69+
uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
7070

7171
# ℹ️ Command-line programs to run using the OS shell.
7272
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -79,6 +79,6 @@ jobs:
7979
# ./location_of_script_within_repo/buildscript.sh
8080

8181
- name: Perform CodeQL Analysis
82-
uses: github/codeql-action/analyze@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
82+
uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
8383
with:
8484
category: "/language:${{matrix.language}}"

.github/workflows/conformance.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
storage.googleapis.com:443
3434
3535
- name: Checkout code
36-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
36+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3737
- name: Setup Go
38-
uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
38+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
3939
with:
4040
go-version: '1.21'
4141
check-latest: true

.github/workflows/dependency-review.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
github.com:443
2727
2828
- name: 'Checkout Repository'
29-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
29+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3030
- name: 'Dependency Review'
3131
uses: actions/dependency-review-action@1360a344ccb0ab6e9475edef90ad2f46bf8003b1 # v3.0.6

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
rubygems.org:443
2828
2929
- name: Checkout repo
30-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
30+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3131
- name: Install Ruby 3.0
3232
uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
3333
with:

.github/workflows/push-gh-pages.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
2424
- name: Checkout repo
25-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
25+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2626
- name: Install Ruby ${{ env.ruby_version }}
2727
uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
2828
with:

.github/workflows/scorecard.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,15 @@ jobs:
3636
bestpractices.coreinfrastructure.org:443
3737
fulcio.sigstore.dev:443
3838
github.com:443
39+
*.github.com:443
3940
oss-fuzz-build-logs.storage.googleapis.com:443
4041
sigstore-tuf-root.storage.googleapis.com:443
4142
rekor.sigstore.dev:443
43+
*.githubusercontent.com:443
44+
www.bestpractices.dev:443
4245
4346
- name: "Checkout code"
44-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
47+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
4548
with:
4649
persist-credentials: false
4750

@@ -58,6 +61,6 @@ jobs:
5861

5962
# Upload the results to GitHub's code scanning dashboard.
6063
- name: "Upload to code-scanning"
61-
uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
64+
uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
6265
with:
6366
sarif_file: results.sarif

.github/workflows/unit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
rubygems.org:443
5050
5151
- name: Checkout repo
52-
uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
52+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
5353
- name: Install Ruby ${{ matrix.ruby }}
5454
uses: ruby/setup-ruby@8a45918450651f5e4784b6031db26f4b9f76b251 # v1.150.0
5555
with:

lib/functions_framework/cli.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ def parse_args argv # rubocop:disable Metrics/MethodLength,Metrics/AbcSize
9898
op.on "-e", "--environment ENV", "Set the Rack environment" do |val|
9999
@env = val
100100
end
101-
op.on "--min-threads NUM", "Set the minimum threead pool size" do |val|
101+
op.on "--min-threads NUM", "Set the minimum thread pool size" do |val|
102102
@min_threads = val
103103
end
104-
op.on "--max-threads NUM", "Set the maximum threead pool size" do |val|
104+
op.on "--max-threads NUM", "Set the maximum thread pool size" do |val|
105105
@max_threads = val
106106
end
107107
op.on "--[no-]detailed-errors", "Set whether to show error details" do |val|

0 commit comments

Comments
 (0)