Commit 672e13db36b6c4efe08835e5d9d8f57d382a49b9

Thomas de Grivel 2023-03-01T09:21:36

rbpkg_ci

diff --git a/lib/rbpkg/repo.rb b/lib/rbpkg/repo.rb
index 69f3b46..8e64a3b 100644
--- a/lib/rbpkg/repo.rb
+++ b/lib/rbpkg/repo.rb
@@ -45,32 +45,20 @@ class Rbpkg::Repo
     verbose(3, "repo(#{name.inspect}).ci(#{ref.inspect}, #{commit.inspect})")
     ref = head unless ref
     commit = hash unless commit
-    Rbpkg::Log.add(ci_log_name_ref(ref))
     Rbpkg::Log.add(ci_log_name_commit(commit))
     sh_name = sh_quote(name)
     sh_ci_dir = sh_quote(ci_dir)
     sh_ci_profile = sh_quote(ci_dir + '/etc/profile')
-    if File.directory?(ci_dir)
-      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg upgrade"
-      Rbpkg::Log.add("rbpkg_ci.#{name}.upgrade")
-      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg checkout #{sh_quote(commit)}"
-      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg info #{sh_name}"
-      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg upgrade #{sh_name}"
-      cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg test #{sh_name}"
-      Rbpkg::Log.ok("rbpkg_ci.#{name}.upgrade")
-    end
-    Rbpkg::Log.add("rbpkg_ci.#{name}.install")
     cmd! "#{sh_quote(Rbpkg.dir)}/bin/rbpkg_bootstrap -f #{sh_quote(ci_dir)}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg clone #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg checkout #{sh_quote(commit)} #{sh_name}"
+    cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg info #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg configure #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg build #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg test #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg install #{sh_name}"
     cmd! "export RBPKG_DIR=#{sh_ci_dir} && . #{sh_ci_profile} && rbpkg info #{sh_name}"
-    Rbpkg::Log.ok("rbpkg_ci.#{name}.install")
     Rbpkg::Log.ok(ci_log_name_commit(commit))
-    Rbpkg::Log.ok(ci_log_name_ref(ref))
   end
 
   def ci_dir