Skip to content

Commit 97bf696

Browse files
Merge pull request #121 from github/dependabot/github_actions/github-actions-7891e17e56
Bump ruby/setup-ruby from 1.188.0 to 1.204.0 in the github-actions group across 1 directory
2 parents 3d4c518 + 31bc108 commit 97bf696

File tree

7 files changed

+27
-19
lines changed

7 files changed

+27
-19
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: checkout
2626
uses: actions/checkout@v4
2727

28-
- uses: ruby/setup-ruby@50ba3386b050ad5b97a41fcb81240cbee1d1821f # pin@v1.188.0
28+
- uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
2929
with:
3030
bundler-cache: true
3131

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: checkout
1919
uses: actions/checkout@v4
2020

21-
- uses: ruby/setup-ruby@50ba3386b050ad5b97a41fcb81240cbee1d1821f # pin@v1.188.0
21+
- uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
2222
with:
2323
bundler-cache: true
2424

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: checkout
2121
uses: actions/checkout@v4
2222

23-
- uses: ruby/setup-ruby@50ba3386b050ad5b97a41fcb81240cbee1d1821f # pin@v1.188.0
23+
- uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
2424
with:
2525
bundler-cache: true
2626

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: checkout
2323
uses: actions/checkout@v4
2424

25-
- uses: ruby/setup-ruby@50ba3386b050ad5b97a41fcb81240cbee1d1821f # pin@v1.188.0
25+
- uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
2626
with:
2727
bundler-cache: true
2828
ruby-version: ${{ matrix.ruby }}

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1
1+
3.3.6

spec/acceptance/github-server/Gemfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
source "https://rubygems.org"
44

5-
gem "rack", "= 2.2.8.1"
5+
gem "rack", "~> 3.1.8"
66
gem "rack-test", "~> 2.1"
7-
gem "sinatra", "= 3.2.0"
7+
gem "rackup", "~> 2.2"
8+
gem "sinatra", "~> 4.1.1"
89
gem "webrick", "~> 1.8"

spec/acceptance/github-server/web.rb

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,25 @@
88
require "webrick/https"
99
require "openssl"
1010

11-
webrick_options = {
12-
Host: "0.0.0.0",
13-
Port: 443,
14-
Logger: WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
15-
SSLEnable: true,
16-
SSLVerifyClient: OpenSSL::SSL::VERIFY_NONE,
17-
SSLCertificate: OpenSSL::X509::Certificate.new(File.read("/acceptance/github-server/ssl.crt")),
18-
SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read("/acceptance/github-server/ssl.key")),
19-
SSLCertName: [["CN", "github.fake"]]
20-
}
21-
2211
class FakeGitHubApi < Sinatra::Base
12+
use Rack::RewindableInput::Middleware
13+
14+
set :server, %w[webrick]
15+
set :server_settings, {
16+
Host: "0.0.0.0",
17+
Port: 443,
18+
Logger: WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
19+
SSLEnable: true,
20+
SSLVerifyClient: OpenSSL::SSL::VERIFY_NONE,
21+
SSLCertificate: OpenSSL::X509::Certificate.new(File.read("/acceptance/github-server/ssl.crt")),
22+
SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read("/acceptance/github-server/ssl.key")),
23+
SSLCertName: [["CN", "github.fake"]]
24+
}
25+
26+
set :port, 443
27+
set :bind, "0.0.0.0"
28+
set :host_authorization, { permitted_hosts: [] }
29+
2330
BASE_DIR = "/tmp/github"
2431

2532
TEAM_MAP_FILE = File.join(BASE_DIR, "team_map.json")
@@ -405,4 +412,4 @@ def graphql_pending_query(query)
405412
end
406413
end
407414

408-
Rack::Handler::WEBrick.run FakeGitHubApi, **webrick_options
415+
FakeGitHubApi.run!

0 commit comments

Comments
 (0)