Skip to content

Commit 93d03d6

Browse files
renovate[bot]silug
andauthored
Update actions/checkout action to v6 (#209)
* Update actions/checkout action to v6 * Handle alternate ordering in binstubs error --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steven Pritchard <steve@sicura.us>
1 parent d7b7def commit 93d03d6

4 files changed

Lines changed: 14 additions & 16 deletions

File tree

.github/workflows/pr_tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
continue-on-error: true
3434
steps:
35-
- uses: actions/checkout@v5
35+
- uses: actions/checkout@v6
3636
- name: "Install Ruby ${{matrix.puppet.ruby_version}}"
3737
uses: ruby/setup-ruby@v1
3838
with:
@@ -46,7 +46,7 @@ jobs:
4646
name: 'RELENG checks'
4747
runs-on: ubuntu-latest
4848
steps:
49-
- uses: actions/checkout@v5
49+
- uses: actions/checkout@v6
5050
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
5151
uses: ruby/setup-ruby@v1
5252
with:
@@ -82,7 +82,7 @@ jobs:
8282
env:
8383
PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
8484
steps:
85-
- uses: actions/checkout@v5
85+
- uses: actions/checkout@v6
8686
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
8787
uses: ruby/setup-ruby@v1
8888
with:

.github/workflows/release_rpms.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
)
195195
196196
- name: Checkout code
197-
uses: actions/checkout@v5
197+
uses: actions/checkout@v6
198198
with:
199199
repository: ${{ env.TARGET_REPO }}
200200
ref: ${{ env.RELEASE_TAG }}

.github/workflows/tag_deploy_rubygem__github-rpms.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
steps:
6565
- name: "Assert '${{ github.ref }}' is a tag"
6666
run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
67-
- uses: actions/checkout@v5
67+
- uses: actions/checkout@v6
6868
with:
6969
ref: ${{ github.ref }}
7070
clean: true
@@ -117,7 +117,7 @@ jobs:
117117
tag: ${{ steps.tag-check.outputs.tag }}
118118
steps:
119119
- name: Checkout code
120-
uses: actions/checkout@v5
120+
uses: actions/checkout@v6
121121
with:
122122
ref: ${{ github.ref }}
123123
clean: true

spec/bin/simp_spec.rb

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,21 @@ def execute_and_signal(command, signal_type)
8989
end
9090

9191
context 'when run' do
92+
let(:binstubs_error) do
93+
Regexp.new(<<~'END_BINSTUBS_ERROR')
94+
The \`puppet\` executable in the \`(?:openvox|puppet)\` gem is being loaded, but it's also present in other gems \((?:openvox|puppet)\)\.
95+
If you meant to run the executable for another gem, make sure you use a project specific binstub \(\`bundle binstub <gem_name>\`\)\.
96+
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names\.
97+
END_BINSTUBS_ERROR
98+
end
99+
92100
it 'handles lack of command line arguments' do
93101
results = execute(simp_exe)
94102
warn("=== stderr: #{results[:stderr]}") unless (results[:stderr]).empty?
95103
warn("=== stdout: #{results[:stdout]}") unless (results[:stdout]).empty?
96104
expect(results[:exitstatus]).to eq 0
97105
expect(results[:stdout]).to match(/SIMP Command Line Interface/)
98106
# expect(results[:stderr]).to be_empty
99-
binstubs_error = <<~END_BINSTUBS_ERROR
100-
The `puppet` executable in the `openvox` gem is being loaded, but it's also present in other gems (puppet).
101-
If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).
102-
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names.
103-
END_BINSTUBS_ERROR
104107
stderr_without_binstubs_error = results[:stderr].gsub(binstubs_error, '')
105108
expect(stderr_without_binstubs_error.strip).to be_empty
106109
end
@@ -110,11 +113,6 @@ def execute_and_signal(command, signal_type)
110113
expect(results[:exitstatus]).to eq 0
111114
expect(results[:stdout]).to match(/=== The SIMP Configuration Tool ===/)
112115
# expect(results[:stderr]).to be_empty
113-
binstubs_error = <<~END_BINSTUBS_ERROR
114-
The `puppet` executable in the `openvox` gem is being loaded, but it's also present in other gems (puppet).
115-
If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).
116-
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names.
117-
END_BINSTUBS_ERROR
118116
stderr_without_binstubs_error = results[:stderr].gsub(binstubs_error, '')
119117
expect(stderr_without_binstubs_error.strip).to be_empty
120118
end

0 commit comments

Comments
 (0)