tools: adapt duplicate checker to new structure

Now there's no need to separate between two sets of packages. Unify the check and check all packages. Signed-off-by: Pau Ruiz Safont <[email protected]>
xapi-project · Aug 2, 2024 · 0840b70 · 0840b70
1 parent e156090
commit 0840b70
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/.github/duplicates-xs-toolstack.txt b/.github/duplicates-xs-toolstack.txt
diff --git a/.github/duplicates-dev-tools.txt → .github/duplicates.txt b/.github/duplicates-dev-tools.txt → .github/duplicates.txt
diff --git a/tools/no-duplicates-check.bash b/tools/no-duplicates-check.bash
@@ -17,27 17,16 @@ function check_no_duplicates {
  done
 }
 
-# makes sure no ordinary opam packages have more than a single version
 # Make sure no ordinary opam packages have more than a single version
 # This is required because of how the rpm distributions are built: they
 # try to install all versions of all ordinary packages, which fails because
 # the versions of a single package are never compatible.
 # several versions of the compiler might be wanted for testing:
 # ocaml, ocaml-system, ocaml-base-compiler
-toolstack_packages=$(opam list --required-by "xs-toolstack" --recursive --short)
-toolstack_dupes=".github/duplicates-xs-toolstack.txt"
-echo checking xs-toolstack...
-check_no_duplicates "$toolstack_packages" "$toolstack_dupes"
-
-# When preparing to switch ocaml compiler versions, several versions of
-# developer tools need multiple versions as each version only allows a single
-# version of the compiler.
-# several versions of the compiler might be wanted for testing:
-# ocaml, ocaml-system, ocaml-base-compiler, ocaml-config
 # several versions of the dev tools might be needed:
 # merlin, ocaml-lsp-server
-dev_packages=$(opam list --required-by "dev-tools" --recursive --short)
-dev_dupes=".github/duplicates-dev-tools.txt"
-echo checking dev-tools...
-check_no_duplicates "$dev_packages" "$dev_dupes"
 packages=$(opam list --short)
 dupes=".github/duplicates.txt"
 check_no_duplicates "$packages" "$dupes"
 
 echo OK