Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: "Install Ruby ${{matrix.puppet.ruby_version}}"
uses: ruby/setup-ruby@v1
with:
Expand All @@ -46,7 +46,7 @@ jobs:
name: 'RELENG checks'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
uses: ruby/setup-ruby@v1
with:
Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
env:
PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ jobs:
)

- name: Checkout code
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
repository: ${{ env.TARGET_REPO }}
ref: ${{ env.RELEASE_TAG }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag_deploy_rubygem__github-rpms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
steps:
- name: "Assert '${{ github.ref }}' is a tag"
run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
clean: true
Expand Down Expand Up @@ -117,7 +117,7 @@ jobs:
tag: ${{ steps.tag-check.outputs.tag }}
steps:
- name: Checkout code
uses: actions/checkout@v5
uses: actions/checkout@v6
with:
ref: ${{ github.ref }}
clean: true
Expand Down
18 changes: 8 additions & 10 deletions spec/bin/simp_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,21 @@ def execute_and_signal(command, signal_type)
end

context 'when run' do
let(:binstubs_error) do
Regexp.new(<<~'END_BINSTUBS_ERROR')
The \`puppet\` executable in the \`(?:openvox|puppet)\` gem is being loaded, but it's also present in other gems \((?:openvox|puppet)\)\.
If you meant to run the executable for another gem, make sure you use a project specific binstub \(\`bundle binstub <gem_name>\`\)\.
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names\.
END_BINSTUBS_ERROR
end

it 'handles lack of command line arguments' do
results = execute(simp_exe)
warn("=== stderr: #{results[:stderr]}") unless (results[:stderr]).empty?
warn("=== stdout: #{results[:stdout]}") unless (results[:stdout]).empty?
expect(results[:exitstatus]).to eq 0
expect(results[:stdout]).to match(/SIMP Command Line Interface/)
# expect(results[:stderr]).to be_empty
binstubs_error = <<~END_BINSTUBS_ERROR
The `puppet` executable in the `openvox` gem is being loaded, but it's also present in other gems (puppet).
If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names.
END_BINSTUBS_ERROR
stderr_without_binstubs_error = results[:stderr].gsub(binstubs_error, '')
expect(stderr_without_binstubs_error.strip).to be_empty
end
Expand All @@ -110,11 +113,6 @@ def execute_and_signal(command, signal_type)
expect(results[:exitstatus]).to eq 0
expect(results[:stdout]).to match(/=== The SIMP Configuration Tool ===/)
# expect(results[:stderr]).to be_empty
binstubs_error = <<~END_BINSTUBS_ERROR
The `puppet` executable in the `openvox` gem is being loaded, but it's also present in other gems (puppet).
If you meant to run the executable for another gem, make sure you use a project specific binstub (`bundle binstub <gem_name>`).
If you plan to use multiple conflicting executables, generate binstubs for them and disambiguate their names.
END_BINSTUBS_ERROR
stderr_without_binstubs_error = results[:stderr].gsub(binstubs_error, '')
expect(stderr_without_binstubs_error.strip).to be_empty
end
Expand Down