Skip to content
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

ci-test: exit on error #3660

Merged
merged 6 commits into from
May 6, 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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def conflicting_dependencies(dependency:, target_version:)
dependency_name: dependency.name,
target_version: target_version,
credentials: credentials,
lockfile_name: lockfile.name,
lockfile_name: lockfile.name
}
)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ def inaccessible_git_dependencies
args: {
dir: tmp_dir,
gemfile_name: gemfile.name,
credentials: credentials,
credentials: credentials
}
)
git_specs.reject do |spec|
Expand All @@ -195,7 +195,7 @@ def jfrog_source
args: {
dir: dir,
gemfile_name: gemfile.name,
credentials: credentials,
credentials: credentials
}
)
end
Expand Down
2 changes: 1 addition & 1 deletion bundler/script/ci-test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e

bundle install
bundle exec rubocop .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,18 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original

allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_return(
["1.5.0", "1.9.0", "1.10.0.beta"]
)
Expand Down Expand Up @@ -252,10 +252,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_raise(subprocess_error)
end

Expand Down Expand Up @@ -285,10 +285,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_raise(subprocess_error)
end

Expand Down Expand Up @@ -318,10 +318,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_raise(subprocess_error)
end

Expand Down Expand Up @@ -351,10 +351,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_raise(subprocess_error)
end

Expand All @@ -373,10 +373,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_return(
[]
)
Expand Down Expand Up @@ -514,18 +514,18 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original

allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_return(
["1.5.0", "1.9.0", "1.10.0.beta"]
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,10 +253,10 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: PackageManagerHelper.bundler_version,
function: "resolve_version",
args: anything
}).
bundler_version: PackageManagerHelper.bundler_version,
function: "resolve_version",
args: anything
}).
and_return(
{
version: "3.0.2",
Expand All @@ -274,7 +274,6 @@
context "and the dependency doesn't have a required Ruby version" do
let(:rubygems_versions) do
fixture(
"ruby",
"rubygems_responses",
"versions-public_suffix.json"
).gsub(/"ruby_version": .*,/, '"ruby_version": null,')
Expand Down
16 changes: 8 additions & 8 deletions bundler/spec/dependabot/bundler/update_checker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,18 @@
allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original
bundler_version: bundler_version,
function: "dependency_source_type",
args: anything
}).and_call_original

allow(Dependabot::Bundler::NativeHelpers).
to receive(:run_bundler_subprocess).
with({
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
bundler_version: bundler_version,
function: "private_registry_versions",
args: anything
}).
and_return(
["1.5.0", "1.9.0", "1.10.0.beta"]
)
Expand Down
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion cargo/script/ci-test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e

bundle install
bundle exec rubocop .
Expand Down
2 changes: 1 addition & 1 deletion common/script/ci-test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e

bundle install
bundle exec rubocop .
Expand Down
Loading