Skip to content

Commit

Permalink
Merge pull request #121 from github/dependabot/github_actions/github-…
Browse files Browse the repository at this point in the history
…actions-7891e17e56

Bump ruby/setup-ruby from 1.188.0 to 1.204.0 in the github-actions group across 1 directory
  • Loading branch information
jasonmacgowan authored Dec 18, 2024
2 parents 3d4c518 + 31bc108 commit 97bf696
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 19 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: checkout
uses: actions/checkout@v4

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: checkout
uses: actions/checkout@v4

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: checkout
uses: actions/checkout@v4

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: checkout
uses: actions/checkout@v4

- uses: ruby/setup-ruby@50ba3386b050ad5b97a41fcb81240cbee1d1821f # pin@v1.188.0
- uses: ruby/setup-ruby@401c19e14f474b54450cd3905bb8b86e2c8509cf # pin@v1.204.0
with:
bundler-cache: true
ruby-version: ${{ matrix.ruby }}
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.3.6
5 changes: 3 additions & 2 deletions spec/acceptance/github-server/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

source "https://rubygems.org"

gem "rack", "= 2.2.8.1"
gem "rack", "~> 3.1.8"
gem "rack-test", "~> 2.1"
gem "sinatra", "= 3.2.0"
gem "rackup", "~> 2.2"
gem "sinatra", "~> 4.1.1"
gem "webrick", "~> 1.8"
31 changes: 19 additions & 12 deletions spec/acceptance/github-server/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,25 @@
require "webrick/https"
require "openssl"

webrick_options = {
Host: "0.0.0.0",
Port: 443,
Logger: WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
SSLEnable: true,
SSLVerifyClient: OpenSSL::SSL::VERIFY_NONE,
SSLCertificate: OpenSSL::X509::Certificate.new(File.read("/acceptance/github-server/ssl.crt")),
SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read("/acceptance/github-server/ssl.key")),
SSLCertName: [["CN", "github.fake"]]
}

class FakeGitHubApi < Sinatra::Base
use Rack::RewindableInput::Middleware

set :server, %w[webrick]
set :server_settings, {
Host: "0.0.0.0",
Port: 443,
Logger: WEBrick::Log::new($stderr, WEBrick::Log::DEBUG),
SSLEnable: true,
SSLVerifyClient: OpenSSL::SSL::VERIFY_NONE,
SSLCertificate: OpenSSL::X509::Certificate.new(File.read("/acceptance/github-server/ssl.crt")),
SSLPrivateKey: OpenSSL::PKey::RSA.new(File.read("/acceptance/github-server/ssl.key")),
SSLCertName: [["CN", "github.fake"]]
}

set :port, 443
set :bind, "0.0.0.0"
set :host_authorization, { permitted_hosts: [] }

BASE_DIR = "/tmp/github"

TEAM_MAP_FILE = File.join(BASE_DIR, "team_map.json")
Expand Down Expand Up @@ -405,4 +412,4 @@ def graphql_pending_query(query)
end
end

Rack::Handler::WEBrick.run FakeGitHubApi, **webrick_options
FakeGitHubApi.run!

0 comments on commit 97bf696

Please sign in to comment.