Skip to content

Commit 062d429

Browse files
authored
Merge pull request #85 from bastelfreak/winrm3
CI: Fix apply job setup & Make Linux vs Windows setup easier & Fix Linux apply tests for Ruby 3.4
2 parents be4922c + 7cab2e4 commit 062d429

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/tests.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,14 @@ jobs:
128128
with:
129129
path: modules
130130
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
131-
- if: matrix.os == 'ubuntu-24.04'
131+
- if: runner.os == 'Linux'
132132
uses: ./.github/actions/sudo_setup
133-
- if: matrix.os == 'windows-2025'
133+
- if: runner.os == 'Windows'
134134
uses: ./.github/actions/windows_agent_setup
135-
- if: matrix.os == 'ubuntu-24.04'
135+
- if: runner.os == 'Linux'
136136
name: Run tests
137137
run: bundle exec rake ci:local_transport:linux
138-
- if: matrix.os == 'windows-2025'
138+
- if: runner.os == 'Windows'
139139
name: Run tests
140140
run: bundle exec rake ci:local_transport:windows
141141

@@ -196,14 +196,14 @@ jobs:
196196
with:
197197
path: modules
198198
key: ${{ runner.os }}-modules-${{ hashFiles('**/Puppetfile') }}
199-
- if: matrix.os == 'ubuntu-24.04'
199+
- if: runner.os == 'Linux'
200200
uses: ./.github/actions/sudo_setup
201-
- if: matrix.os == 'windows-2025'
201+
- if: runner.os == 'Windows'
202202
uses: ./.github/actions/windows_agent_setup
203-
- if: matrix.os == 'ubuntu-22.04'
203+
- if: runner.os == 'Linux'
204204
name: Run tests
205205
run: bundle exec rake ci:apply:linux
206-
- if: matrix.os == 'windows-2025'
206+
- if: runner.os == 'Windows'
207207
name: Run tests
208208
run: bundle exec rake ci:apply:windows
209209

spec/integration/apply_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
results.each do |result|
204204
expect(result['status']).to eq('failure')
205205
expect(result.dig('value', '_error', 'msg').lines.count).to be > 1
206-
expect(result.dig('value', '_error', 'msg').lines).to include(/in `cmp_Numeric'/)
206+
expect(result.dig('value', '_error', 'msg').lines).to include(/A Numeric is not comparable to non Numeric/)
207207
end
208208
end
209209
end

0 commit comments

Comments
 (0)