Commit 2ad5e407d70abb47cd7be992c48c20e1cf1dc458
2023-02-26T02:52:19
rbpkg_ci_mux
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129
diff --git a/bin/rbpkg_ci b/bin/rbpkg_ci
index b1e5113..3723cca 100755
--- a/bin/rbpkg_ci
+++ b/bin/rbpkg_ci
@@ -37,9 +37,8 @@ def rbpkg_ci
cmd = "rm -rf #{sh_quote(Rbpkg.ci_dir)}"
verbose(1, cmd)
raise "command failed: #{cmd.inspect}" unless system(cmd)
- Rbpkg.ci_init
- shift
- exit if $ARGS == []
+ Rbpkg::Log.ok_all
+ exit 0
when "-h"
usage
when "--help"
@@ -53,11 +52,11 @@ def rbpkg_ci
commit = $ARGS[0] ? shift : nil
usage unless $ARGS == []
Rbpkg::Repos.repo(repo).ci(branch, commit)
+ Rbpkg::Log.ok_all
end
begin
rbpkg_ci
- Rbpkg::Log.ok_all
rescue => error
verbose(-1, error.backtrace.reverse.join("\n"))
verbose(-1, "#{error.class.name}: #{error.message}")
diff --git a/bin/rbpkg_ci_mux b/bin/rbpkg_ci_mux
index 3a27a49..ff822a1 100755
--- a/bin/rbpkg_ci_mux
+++ b/bin/rbpkg_ci_mux
@@ -33,57 +33,53 @@ end
def rbpkg_ci_mux
clean = false
- remote = true
upgrade = false
- while case $ARGS[0]
- when "--clean"
- clean = true
- shift
- when "-h"
- usage
- when "--help"
- usage
- when "--no-remote"
- remote = false
- shift
- when "--upgrade"
- Rbpkg.upgrade_self
- shift
- upgrade = true
- end
+ while (case $ARGS[0]
+ when "--clean"
+ shift
+ cmd = "rm -rf #{sh_quote(Rbpkg.ci_dir)}"
+ verbose(1, cmd)
+ raise "command failed: #{cmd.inspect}" unless system(cmd)
+ Rbpkg.ci_init
+ hosts = $ARGS
+ hosts.each do |host|
+ cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg_ci --clean"
+ end
+ Rbpkg::Log.ok_all
+ exit 0
+ when "-h"
+ usage
+ when "--help"
+ usage
+ when "--no-remote"
+ Rbpkg.ci_mux
+ Rbpkg::Log.ok_all
+ exit 0
+ when "--upgrade"
+ Rbpkg.upgrade_self
+ shift
+ hosts = $ARGS
+ hosts.each do |host|
+ cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg upgrade"
+ end
+ Rbpkg::Log.ok_all
+ exit 0
+ end)
true
end
repo = shift
branch = shift
commit = shift
- threads = []
hosts = $ARGS
- if clean
- cmd = "rm -rf #{sh_quote(Rbpkg.ci_dir)}"
- verbose(1, cmd)
- raise "command failed: #{cmd.inspect}" unless system(cmd)
- Rbpkg.ci_init
- if remote
- hosts.each do |host|
- cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg_ci --clean"
- end
- end
- end
- if upgrade && remote
- hosts.each do |host|
- cmd! "ssh #{sh_quote(host)} rbpkg/bin/rbpkg upgrade"
+ Thread.report_on_exception = false
+ threads = []
+ hosts.each do |host|
+ threads << Thread.new do
+ Rbpkg.ci_remote(repo, branch, commit, host)
end
end
- if remote
- hosts.each do |host|
- Thread.report_on_exception = false
- threads << Thread.new do
- Rbpkg.ci_remote(repo, branch, commit, host)
- end
- end
- threads.each do |t|
- t.join
- end
+ threads.each do |t|
+ t.join
end
Rbpkg.ci_mux
end