beaker 7.8.3 → 7.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.github/workflows/release.yml +7 -7
- data/.github/workflows/test.yml +2 -2
- data/CHANGELOG.md +10 -2
- data/lib/beaker/host/windows/exec.rb +5 -2
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/host/windows/exec_spec.rb +19 -0
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bc70d9b91085103e8380ab0e1a5dbbbbba99cd091d6b214462f95ce4f4735bd5
|
|
4
|
+
data.tar.gz: e4a7714defa006440a6b39c017f42ecd8c6ef1bc97c2793c86b1386c9737ff5d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b3d88078d0717e7768c614884f1e9fa430cd5cb55465d8bc570ab5f154353897ae525b24a8a54b0b0b896f5a3ce1f4572a5af2c84f15b10ca0f564ec6c0f8d58
|
|
7
|
+
data.tar.gz: 279efae545117ac3c344ccad94d1830fba5793c2235c6fa9ceeddc6b3859b5fed6b20a4bfeb9e4975f27fa68acd78c5f88bbf5cd67b7882a2c83277aec721cee
|
|
@@ -17,14 +17,14 @@ jobs:
|
|
|
17
17
|
steps:
|
|
18
18
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
|
19
19
|
- name: Install Ruby
|
|
20
|
-
uses: ruby/setup-ruby@
|
|
20
|
+
uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
|
|
21
21
|
with:
|
|
22
22
|
ruby-version: 'ruby'
|
|
23
23
|
- name: Build gem
|
|
24
24
|
shell: bash
|
|
25
25
|
run: gem build --verbose *.gemspec
|
|
26
26
|
- name: Upload gem to GitHub cache
|
|
27
|
-
uses: actions/upload-artifact@
|
|
27
|
+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
|
|
28
28
|
with:
|
|
29
29
|
name: gem-artifact
|
|
30
30
|
path: '*.gem'
|
|
@@ -39,7 +39,7 @@ jobs:
|
|
|
39
39
|
contents: write # clone repo and create release
|
|
40
40
|
steps:
|
|
41
41
|
- name: Download gem from GitHub cache
|
|
42
|
-
uses: actions/download-artifact@
|
|
42
|
+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
|
43
43
|
with:
|
|
44
44
|
name: gem-artifact
|
|
45
45
|
- name: Create Release
|
|
@@ -56,7 +56,7 @@ jobs:
|
|
|
56
56
|
packages: write # publish to rubygems.pkg.github.com
|
|
57
57
|
steps:
|
|
58
58
|
- name: Download gem from GitHub cache
|
|
59
|
-
uses: actions/download-artifact@
|
|
59
|
+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
|
60
60
|
with:
|
|
61
61
|
name: gem-artifact
|
|
62
62
|
- name: Publish gem to GitHub packages
|
|
@@ -73,7 +73,7 @@ jobs:
|
|
|
73
73
|
id-token: write # rubygems.org authentication
|
|
74
74
|
steps:
|
|
75
75
|
- name: Download gem from GitHub cache
|
|
76
|
-
uses: actions/download-artifact@
|
|
76
|
+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
|
77
77
|
with:
|
|
78
78
|
name: gem-artifact
|
|
79
79
|
- uses: rubygems/configure-rubygems-credentials@dc5a8d8553e6ee01fc26761a49e99e733d17954a # v2.1.0
|
|
@@ -92,11 +92,11 @@ jobs:
|
|
|
92
92
|
- release-to-rubygems
|
|
93
93
|
steps:
|
|
94
94
|
- name: Download gem from GitHub cache
|
|
95
|
-
uses: actions/download-artifact@
|
|
95
|
+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
|
|
96
96
|
with:
|
|
97
97
|
name: gem-artifact
|
|
98
98
|
- name: Install Ruby
|
|
99
|
-
uses: ruby/setup-ruby@
|
|
99
|
+
uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
|
|
100
100
|
with:
|
|
101
101
|
ruby-version: 'ruby'
|
|
102
102
|
- name: Wait for release to propagate
|
data/.github/workflows/test.yml
CHANGED
|
@@ -18,7 +18,7 @@ jobs:
|
|
|
18
18
|
steps:
|
|
19
19
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
|
20
20
|
- name: Install Ruby ${{ matrix.ruby }}
|
|
21
|
-
uses: ruby/setup-ruby@
|
|
21
|
+
uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
|
|
22
22
|
with:
|
|
23
23
|
ruby-version: '4.0'
|
|
24
24
|
bundler-cache: true
|
|
@@ -40,7 +40,7 @@ jobs:
|
|
|
40
40
|
steps:
|
|
41
41
|
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
|
|
42
42
|
- name: Install Ruby ${{ matrix.ruby }}
|
|
43
|
-
uses: ruby/setup-ruby@
|
|
43
|
+
uses: ruby/setup-ruby@b3aaceaef7e0ee231b499e7b5f49c03fc1d32199 # v1.338.0
|
|
44
44
|
with:
|
|
45
45
|
ruby-version: ${{ matrix.ruby }}
|
|
46
46
|
bundler-cache: true
|
data/CHANGELOG.md
CHANGED
|
@@ -2,9 +2,17 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
|
|
5
|
-
## [7.8.
|
|
5
|
+
## [7.8.4](https://github.com/voxpupuli/beaker/tree/7.8.4) (2026-11-11)
|
|
6
6
|
|
|
7
|
-
[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.
|
|
7
|
+
[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.3...7.8.4)
|
|
8
|
+
|
|
9
|
+
**Fixed bugs:**
|
|
10
|
+
|
|
11
|
+
- Restart Cygwin's sshd under its current service name [\#2059](https://github.com/voxpupuli/beaker/pull/2059) ([nmburgan](https://github.com/nmburgan))
|
|
12
|
+
|
|
13
|
+
## [v7.8.3](https://github.com/voxpupuli/beaker/tree/v7.8.3) (2026-09-17)
|
|
14
|
+
|
|
15
|
+
[Full Changelog](https://github.com/voxpupuli/beaker/compare/v7.8.2...v7.8.3)
|
|
8
16
|
|
|
9
17
|
**Fixed bugs:**
|
|
10
18
|
|
|
@@ -65,13 +65,16 @@ module Windows::Exec
|
|
|
65
65
|
#
|
|
66
66
|
# @return [Result] result of starting SSH service
|
|
67
67
|
def ssh_service_restart
|
|
68
|
+
# Cygwin's ssh-host-config names the service cygsshd. Older versions named it sshd.
|
|
69
|
+
cygsshd = exec(Beaker::Command.new('cygrunsrv -Q cygsshd'), :accept_all_exit_codes => true).exit_code == 0
|
|
70
|
+
service_name = cygsshd ? 'cygsshd' : 'sshd'
|
|
68
71
|
command_result = nil
|
|
69
72
|
# we get periodic failures to restart the service, so looping these with re-attempts
|
|
70
73
|
repeat_fibonacci_style_for(5) do
|
|
71
|
-
0 == exec(Beaker::Command.new("cygrunsrv -E
|
|
74
|
+
0 == exec(Beaker::Command.new("cygrunsrv -E #{service_name}"), :acceptable_exit_codes => [0, 1]).exit_code
|
|
72
75
|
end
|
|
73
76
|
repeat_fibonacci_style_for(5) do
|
|
74
|
-
command_result = exec(Beaker::Command.new("cygrunsrv -S
|
|
77
|
+
command_result = exec(Beaker::Command.new("cygrunsrv -S #{service_name}"), :acceptable_exit_codes => [0, 1])
|
|
75
78
|
0 == command_result.exit_code
|
|
76
79
|
end
|
|
77
80
|
command_result
|
data/lib/beaker/version.rb
CHANGED
|
@@ -78,6 +78,25 @@ module Beaker
|
|
|
78
78
|
end
|
|
79
79
|
end
|
|
80
80
|
|
|
81
|
+
describe '#ssh_service_restart' do
|
|
82
|
+
let(:success) { double('success', :exit_code => 0) }
|
|
83
|
+
let(:failure) { double('failure', :exit_code => 1) }
|
|
84
|
+
|
|
85
|
+
it 'restarts the cygsshd service when it exists' do
|
|
86
|
+
allow(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -Q cygsshd'), anything).and_return(success)
|
|
87
|
+
expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -E cygsshd'), anything).and_return(success)
|
|
88
|
+
expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -S cygsshd'), anything).and_return(success)
|
|
89
|
+
expect(instance.ssh_service_restart).to eq(success)
|
|
90
|
+
end
|
|
91
|
+
|
|
92
|
+
it 'restarts the sshd service when there is no cygsshd service' do
|
|
93
|
+
allow(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -Q cygsshd'), anything).and_return(failure)
|
|
94
|
+
expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -E sshd'), anything).and_return(success)
|
|
95
|
+
expect(instance).to receive(:exec).with(having_attributes(command: 'cygrunsrv -S sshd'), anything).and_return(success)
|
|
96
|
+
expect(instance.ssh_service_restart).to eq(success)
|
|
97
|
+
end
|
|
98
|
+
end
|
|
99
|
+
|
|
81
100
|
context 'mv' do
|
|
82
101
|
let(:origin) { '/origin/path/of/content' }
|
|
83
102
|
let(:destination) { '/destination/path/of/content' }
|