diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index dbb7a28c..5fae1442 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -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: @@ -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: @@ -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: diff --git a/.github/workflows/release_rpms.yml b/.github/workflows/release_rpms.yml index fd4514f7..821d85c1 100644 --- a/.github/workflows/release_rpms.yml +++ b/.github/workflows/release_rpms.yml @@ -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 }} diff --git a/.github/workflows/tag_deploy_rubygem__github-rpms.yml b/.github/workflows/tag_deploy_rubygem__github-rpms.yml index 964540ff..ac08d2f7 100644 --- a/.github/workflows/tag_deploy_rubygem__github-rpms.yml +++ b/.github/workflows/tag_deploy_rubygem__github-rpms.yml @@ -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 @@ -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 diff --git a/spec/bin/simp_spec.rb b/spec/bin/simp_spec.rb index c886e480..d3d1be26 100644 --- a/spec/bin/simp_spec.rb +++ b/spec/bin/simp_spec.rb @@ -89,6 +89,14 @@ 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 \`\)\. + 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? @@ -96,11 +104,6 @@ def execute_and_signal(command, signal_type) 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 `). - 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 @@ -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 `). - 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