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.

Sign up for GitHub

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

Jump to bottom

remove glob experiment since glob support is released #10239

Merged
merged 1 commit into from
Jul 18, 2024
Merged

remove glob experiment since glob support is released #10239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion updater/lib/dependabot/dependency_snapshot.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def self.create_from_job_definition(job:, job_definition:)
file
end

if Dependabot::Experiments.enabled?(:globs) && job.source.directories
if job.source.directories
# The job.source.directory may contain globs, so we use the directories from the fetched files
job.source.directories = decoded_dependency_files.flat_map(&:directory).uniq
end
Expand Down
15 changes: 2 additions & 13 deletions updater/lib/dependabot/file_fetcher_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,19 +100,8 @@ def file_fetcher_for_directory(directory)
end

def dependency_files_for_multi_directories
if Dependabot::Experiments.enabled?(:globs)
return @dependency_files_for_multi_directories ||= dependency_files_for_globs
end

@dependency_files_for_multi_directories ||= job.source.directories.flat_map do |dir|
ff = with_retries { file_fetcher_for_directory(dir) }
files = ff.files
post_ecosystem_versions(ff) if should_record_ecosystem_versions?
files
end
end
return @dependency_files_for_multi_directories if defined?(@dependency_files_for_multi_directories)

def dependency_files_for_globs
has_glob = T.let(false, T::Boolean)
directories = Dir.chdir(job.repo_contents_path) do
job.source.directories.map do |dir|
Expand All @@ -124,7 +113,7 @@ def dependency_files_for_globs
end.flatten
end.uniq

directories.flat_map do |dir|
@dependency_files_for_multi_directories = directories.flat_map do |dir|
ff = with_retries { file_fetcher_for_directory(dir) }

begin
Expand Down
Loading