Skip to content

Commit 1f0789a

Browse files
authored
Merge pull request #245 from rock-core/remove_flavor_sanity_checks
chore: remove flavor-related sanity checks
2 parents 4df8e82 + 8dbdaf9 commit 1f0789a

File tree

3 files changed

+0
-60
lines changed

3 files changed

+0
-60
lines changed

overrides.rb

-31
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,10 @@
11
Rock.flavors.finalize
2-
wrong_branch = Rock.flavors.find_all_overriden_flavored_branches
3-
4-
wrong_branch = wrong_branch.find_all { |pkg| pkg.importer.branch != 'rock-rc' }
5-
if !wrong_branch.empty?
6-
pkgs = wrong_branch.map { |pkg| "#{pkg.name}(#{pkg.importer.branch})" }.join(", ")
7-
8-
Autoproj.warn ""
9-
Autoproj.warn "the following packages are using a different branch than the current flavor"
10-
Autoproj.warn "it is assumed that it is intentional"
11-
Autoproj.warn " #{pkgs}"
12-
end
132

143
Autoproj.env_add_path 'ROCK_BUNDLE_PATH', File.join(Autobuild.prefix, 'share', 'rock')
154
Autoproj.env_add_path 'ROCK_BUNDLE_PATH', File.join(Autoproj.root_dir, 'bundles')
165

17-
require File.join(__dir__, 'rock', 'git_hook')
186
require File.join(__dir__, 'rock', 'cmake_build_type')
197
Autoproj.manifest.each_autobuild_package do |pkg|
20-
case pkg.importer
21-
when Autobuild::Git
22-
if ENV['ROCK_DISABLE_CROSS_FLAVOR_CHECKS'] != '1'
23-
# Finally, verify that when pkg A from flavor X depends on pkg B,
24-
# then B needs to be available in flavor X as well
25-
Rock.flavors.verify_cross_flavor_dependencies(pkg)
26-
end
27-
28-
# Do the git hook setup in a separate setup block since we must do it
29-
# post-import
30-
pkg.post_import do
31-
if pkg.importer.branch == "next" || pkg.importer.branch == "stable"
32-
Rock.install_git_hook pkg, 'git_do_not_commit_hook', 'pre-commit'
33-
else
34-
Rock.remove_git_hook pkg, 'pre-commit'
35-
end
36-
end
37-
end
38-
398
# NOTE: do not use a case/when to dispatch the package types.
409
# Autobuild::Orogen is a subclass of Autobuild::CMake - and therefore needs
4110
# to get through both ifs. It's not the case with Autobuild::Ruby, but I

rock/git_do_not_commit_hook

-8
This file was deleted.

rock/git_hook.rb

-21
This file was deleted.

0 commit comments

Comments
 (0)