Skip to content

RUBY-2849 Fix GitHub Actions #2386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Dec 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,23 @@ jobs:
bundler: 2
- name: bundle
run: bundle install --jobs 4 --retry 3
- name: prepare test suite
run: bundle exec rake spec:prepare
env:
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
- name: prepare replica set
run: ruby -Ilib -I.evergreen/lib -rbundler/setup -rserver_setup -e ServerSetup.new.setup_tags
if: ${{ matrix.topology == 'replica_set' }}
env:
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
- name: wait for sessions
run: bundle exec rake spec:wait_for_sessions
if: ${{ matrix.topology == 'sharded_cluster' && matrix.mongodb == '3.6' }}
env:
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
- name: test
timeout-minutes: 60
continue-on-error: true
continue-on-error: false
run: bundle exec rake spec:ci
env:
MONGODB_URI: ${{ steps.start-mongodb.outputs.cluster-uri }}
3 changes: 2 additions & 1 deletion spec/integration/versioned_api_examples_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@
# the tests to simple configurations
require_no_auth
require_no_tls
min_server_version("5.0")

let(:uri_string) do
"mongodb://#{SpecConfig.instance.addresses.join(',')}"
"mongodb://#{SpecConfig.instance.addresses.join(',')}/versioned-api-examples"
end

it 'Versioned API example 1' do
Expand Down
2 changes: 1 addition & 1 deletion spec/shared
6 changes: 5 additions & 1 deletion spec/support/spec_config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,11 @@ def client_cert_path
end

def local_client_pem_path
"#{ssl_certs_dir}/client.pem"
if (algo = ENV['OCSP_ALGORITHM'])&.empty?
"#{ssl_certs_dir}/client.pem"
else
Pathname.new("#{spec_root}/support/ocsp/#{algo}/server.pem")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be great if this had a comment explaining the logic behind each of the branches.

end
end

def client_pem_path
Expand Down