diff --git a/.github/workflows/apply.yaml b/.github/workflows/apply.yaml index 505553d24..ca5514ba9 100644 --- a/.github/workflows/apply.yaml +++ b/.github/workflows/apply.yaml @@ -1,18 +1,11 @@ +--- name: Apply on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/apply.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/bolt_spec.yaml b/.github/workflows/bolt_spec.yaml index 2926ec98a..5c0576a1d 100644 --- a/.github/workflows/bolt_spec.yaml +++ b/.github/workflows/bolt_spec.yaml @@ -1,19 +1,12 @@ +--- + name: BoltSpec on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/bolt_spec.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - lib/bolt_spec/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/docker_transport.yaml b/.github/workflows/docker_transport.yaml index 61bdd6a3d..8205b771c 100644 --- a/.github/workflows/docker_transport.yaml +++ b/.github/workflows/docker_transport.yaml @@ -1,3 +1,4 @@ +--- name: Docker transport on: diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 16a05253e..6c60c537f 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -1,18 +1,11 @@ +--- name: Linux on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/linux.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/modules.yaml b/.github/workflows/modules.yaml index 403a0145f..63a00831f 100644 --- a/.github/workflows/modules.yaml +++ b/.github/workflows/modules.yaml @@ -1,18 +1,11 @@ +--- name: Modules on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/modules.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - bolt_spec_spec/** - - lib/bolt/** - - modules/** - - rakelib/tests.rake + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/pwsh.yaml b/.github/workflows/pwsh.yaml index 42dd47b48..4762c6bab 100644 --- a/.github/workflows/pwsh.yaml +++ b/.github/workflows/pwsh.yaml @@ -1,13 +1,11 @@ +--- name: pwsh on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/pwsh.yaml - - pwsh_module/* - - lib/bolt/bolt_option_parser.rb - - rakelib/pwsh.rake + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/schemas.yaml b/.github/workflows/schemas.yaml index 701379061..0a50e565b 100644 --- a/.github/workflows/schemas.yaml +++ b/.github/workflows/schemas.yaml @@ -1,14 +1,11 @@ +--- name: Schemas on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - lib/bolt/config/options.rb - - lib/bolt/config/transport/** - - lib/bolt/inventory/options.rb - - rakelib/schemas.rake - - schemas/*.json + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/ssh_transport.yaml b/.github/workflows/ssh_transport.yaml index e226ca399..f8d65b41d 100644 --- a/.github/workflows/ssh_transport.yaml +++ b/.github/workflows/ssh_transport.yaml @@ -1,18 +1,11 @@ +--- name: SSH Transport on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/ssh_transport.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index 4577f2aaa..364d1551c 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -2,18 +2,10 @@ name: Windows on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/windows.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main env: BOLT_WINRM_USER: roddypiper diff --git a/.github/workflows/winrm_transport.yaml b/.github/workflows/winrm_transport.yaml index 748eef3b8..29e498df8 100644 --- a/.github/workflows/winrm_transport.yaml +++ b/.github/workflows/winrm_transport.yaml @@ -1,18 +1,11 @@ +--- name: WinRM Transport on: - pull_request: - types: [opened, reopened, edited, synchronize] - paths: - - .github/workflows/winrm_transport.yaml - - bolt.gemspec - - Gemfile - - Puppetfile - - bolt-modules/** - - lib/bolt/** - - libexec/** - - rakelib/tests.rake - - spec/** + pull_request: {} + push: + branches: + - main permissions: contents: read diff --git a/lib/bolt/version.rb b/lib/bolt/version.rb index b75833635..be6696259 100644 --- a/lib/bolt/version.rb +++ b/lib/bolt/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Bolt - VERSION = '5.0.0-rc2' + VERSION = '5.1.0' end diff --git a/openbolt.gemspec b/openbolt.gemspec index d3be7da01..ac762cc94 100644 --- a/openbolt.gemspec +++ b/openbolt.gemspec @@ -61,7 +61,7 @@ Gem::Specification.new do |spec| spec.add_dependency "puppetfile-resolver", ">= 0.6.2", "< 1.0" spec.add_dependency "puppet-resource_api", ">= 1.8.1" spec.add_dependency "r10k", ">= 3.10", "< 5" - spec.add_dependency "ruby_smb", ">= 1.0", "< 4.0.0" + spec.add_dependency "ruby_smb", "~> 1.0" spec.add_dependency "terminal-table", "~> 3.0" spec.add_dependency "winrm", "~> 2.0" spec.add_dependency "winrm-fs", "~> 1.3" diff --git a/pwsh_module/command.tests.ps1 b/pwsh_module/command.tests.ps1 index ef7070b89..07c242cf8 100644 --- a/pwsh_module/command.tests.ps1 +++ b/pwsh_module/command.tests.ps1 @@ -14,7 +14,7 @@ BeforeAll { $common = @( 'Version', 'Debug', 'ErrorAction', 'ErrorVariable', 'InformationAction', 'InformationVariable', 'OutBuffer', 'OutVariable', 'PipelineVariable', - 'Verbose', 'WarningAction', 'WarningVariable', 'Confirm', 'Whatif' + 'Verbose', 'WarningAction', 'WarningVariable', 'Confirm', 'Whatif', 'ProgressAction' ) } diff --git a/spec/integration/transport/local_spec.rb b/spec/integration/transport/local_spec.rb index cde851aff..822a91c9a 100644 --- a/spec/integration/transport/local_spec.rb +++ b/spec/integration/transport/local_spec.rb @@ -83,7 +83,7 @@ def make_target expect(runner.upload(target, file.path, dest, run_as: user).message).to match(/Uploaded/) expect(runner.run_command(target, "cat #{dest}", run_as: user)['stdout']).to eq(contents) expect(runner.run_command(target, "stat -c %U #{dest}", run_as: user)['stdout'].chomp).to eq(user) - expect(runner.run_command(target, "stat -c %G #{dest}", run_as: user)['stdout'].chomp).to eq('docker') + expect(runner.run_command(target, "stat -c %G #{dest}", run_as: user)['stdout'].chomp).to eq('runner') end runner.run_command(target, "rm #{dest}", sudoable: true, run_as: user)