[sysadmin/neon-tooling] nci/lib: consolidate the exclusion logic for bootstrapping packages

Git commit d85aef3c9f19249a1a210c491d95aaa5f867c3d4 by Carlos De Maine.
Committed on 21/07/2026 at 04:03.
Pushed by carlosdem into branch 'master'.

consolidate the exclusion logic for bootstrapping packages

only install neon-settings-2 and kde-release-keyring if the running job is neither of them

M  +3    -4    nci/lib/setup_repo.rb

https://invent.kde.org/sysadmin/neon-tooling/-/commit/d85aef3c9f19249a1a210c491d95aaa5f867c3d4

diff --git a/nci/lib/setup_repo.rb b/nci/lib/setup_repo.rb
index 07e4530f..0407e148 100644
--- a/nci/lib/setup_repo.rb
+++ b/nci/lib/setup_repo.rb
@@ -60,11 +60,10 @@ module NCI
     return unless with_install
 
     deps = %w[pkg-kde-tools debhelper cmake quilt dh-python dh-translations]
-    if setup_repo_codename == "noble"
-      deps << 'pkg-kde-tools-neon'
+    deps << 'pkg-kde-tools-neon' if setup_repo_codename == 'noble'
+    unless ENV.fetch('JOB_NAME').match?(/kde-keyring|neon-settings/)
+      deps << 'kde-release-keyring neon-settings-2'
     end
-    deps << 'kde-release-keyring' unless ENV.fetch('JOB_NAME').include?('kde-keyring')
-    deps << 'neon-settings-2' unless ENV.fetch('JOB_NAME').include?('neon-settings')
     raise 'failed to install deps' unless Apt.install(deps)
     
     # Qt6 Hack