diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index a8a16322aac..275ed2f17c5 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -41,92 +41,124 @@ jobs: steps: - uses: actions/checkout@v3 - uses: dorny/paths-filter@v2 + if: github.event_name != 'workflow_dispatch' id: changes with: filters: | actions: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'github_actions/**' bundler: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'bundler/**' cargo: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'cargo/**' - common: - - Dockerfile - - 'common/**' composer: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'composer/**' docker: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'docker/**' elm: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'elm/**' go: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'go_modules/**' gradle: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'maven/**' - 'gradle/**' hex: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'hex/**' maven: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'maven/**' npm: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'npm_and_yarn/**' nuget: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'nuget/**' - omnibus: - - Dockerfile - - 'common/**' - - 'omnibus/**' pub: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'pub/**' pip: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'python/**' 'pip-compile': - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'python/**' pipenv: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'python/**' poetry: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'python/**' submodules: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'git_submodules/**' terraform: - Dockerfile + - Dockerfile.updater - 'common/**' + - 'updater/**' - 'terraform/**' - name: Download CLI and test diff --git a/updater/lib/dependabot/job.rb b/updater/lib/dependabot/job.rb index 958919e5436..38800047eca 100644 --- a/updater/lib/dependabot/job.rb +++ b/updater/lib/dependabot/job.rb @@ -64,10 +64,6 @@ def reject_external_code? @reject_external_code end - def build_pull_request_message? - experiments.fetch(:build_pull_request_message, false) - end - # rubocop:disable Metrics/PerceivedComplexity def allowed_update?(dependency) allowed_updates.any? do |update| diff --git a/updater/lib/dependabot/updater.rb b/updater/lib/dependabot/updater.rb index d0db0c10dc8..5131919cd1f 100644 --- a/updater/lib/dependabot/updater.rb +++ b/updater/lib/dependabot/updater.rb @@ -959,8 +959,6 @@ def handle_parser_error(error) # rubocop:enable Metrics/MethodLength # rubocop:enable Metrics/CyclomaticComplexity def pr_message(dependencies, files) - return nil unless job.build_pull_request_message? - Dependabot::PullRequestCreator::MessageBuilder.new( source: job.source, dependencies: dependencies, diff --git a/updater/spec/dependabot/integration_spec.rb b/updater/spec/dependabot/integration_spec.rb index bd4ec0d62a5..de16d664c61 100644 --- a/updater/spec/dependabot/integration_spec.rb +++ b/updater/spec/dependabot/integration_spec.rb @@ -37,6 +37,9 @@ allow(Dependabot::Environment).to receive(:token).and_return("some_token") allow(Dependabot::Environment).to receive(:job_id).and_return(job_id) allow(Dependabot.logger).to receive(:info).and_call_original + message_builder = double(Dependabot::PullRequestCreator::MessageBuilder) + allow(Dependabot::PullRequestCreator::MessageBuilder).to receive(:new).and_return(message_builder) + allow(message_builder).to receive(:message).and_return(nil) end describe "bundler" do diff --git a/updater/spec/dependabot/updater_spec.rb b/updater/spec/dependabot/updater_spec.rb index 7fa084398e6..9d4bd6da341 100644 --- a/updater/spec/dependabot/updater_spec.rb +++ b/updater/spec/dependabot/updater_spec.rb @@ -196,6 +196,10 @@ to_return(status: 200, body: fixture("rubygems-info-a")) stub_request(:get, "https://index.rubygems.org/info/dummy-pkg-b"). to_return(status: 200, body: fixture("rubygems-info-b")) + + message_builder = double(Dependabot::PullRequestCreator::MessageBuilder) + allow(Dependabot::PullRequestCreator::MessageBuilder).to receive(:new).and_return(message_builder) + allow(message_builder).to receive(:message).and_return(nil) end let(:dependency_files) do @@ -767,8 +771,20 @@ def expect_update_checker_with_ignored_versions(versions) updater.run end - it "does not build pull request message" do - expect(Dependabot::PullRequestCreator::MessageBuilder).not_to receive(:new) + it "builds pull request message" do + expect(Dependabot::PullRequestCreator::MessageBuilder). + to receive(:new).with( + source: job.source, + files: an_instance_of(Array), + dependencies: an_instance_of(Array), + credentials: credentials, + commit_message_options: { + include_scope: commit_message_include_scope, + prefix: commit_message_prefix, + prefix_development: commit_message_prefix_development + }, + github_redirection_service: "github-redirect.dependabot.com" + ) updater.run end @@ -1608,27 +1624,6 @@ def expect_update_checker_with_ignored_versions(versions) end end - context "when build_pull_request_message is set" do - let(:experiments) { { "build-pull-request-message" => true } } - - it "builds pull request message" do - expect(Dependabot::PullRequestCreator::MessageBuilder). - to receive(:new).with( - source: job.source, - files: an_instance_of(Array), - dependencies: an_instance_of(Array), - credentials: credentials, - commit_message_options: { - include_scope: commit_message_include_scope, - prefix: commit_message_prefix, - prefix_development: commit_message_prefix_development - }, - github_redirection_service: "github-redirect.dependabot.com" - ) - updater.run - end - end - describe "experiments" do let(:experiments) do { "large-hadron-collider" => true }