Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update actions workflows to use ubuntu-22.04 #3361

Merged
merged 3 commits into from
Nov 20, 2024
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/apply.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -48,11 +48,11 @@ jobs:
- name: Install modules
if: steps.modules.outputs.cache-hit != 'true'
run: bundle exec r10k puppetfile install
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-22.04'
uses: ./.github/actions/sudo_setup
- if: matrix.os == 'windows-latest'
uses: ./.github/actions/windows_agent_setup
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-22.04'
name: Run tests
run: bundle exec rake ci:apply:linux
- if: matrix.os == 'windows-latest'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bolt_server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/bolt_spec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -49,13 +49,13 @@ jobs:
- name: Install modules
if: steps.modules.outputs.cache-hit != 'true'
run: bundle exec r10k puppetfile install
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-22.04'
uses: ./.github/actions/docker_setup
- if: matrix.os == 'windows-latest'
uses: ./.github/actions/windows_agentless_setup
- name: Run tests
if: matrix.os == 'windows-latest'
run: bundle exec rake ci:boltspec:windows
- name: Run tests
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'ubuntu-22.04'
run: bundle exec rake ci:boltspec:linux
2 changes: 1 addition & 1 deletion .github/workflows/docker_transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
docker_transport:
name: Docker Transport
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
ruby: [3.1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

docs:
name: Docs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

rubocop:
name: Rubocop
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
integration:
name: Integration
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
ruby: [3.1]
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/local_transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand All @@ -48,11 +48,11 @@ jobs:
- name: Install modules
if: steps.modules.outputs.cache-hit != 'true'
run: bundle exec r10k puppetfile install
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-22.04'
uses: ./.github/actions/sudo_setup
- if: matrix.os == 'windows-latest'
uses: ./.github/actions/windows_agent_setup
- if: matrix.os == 'ubuntu-latest'
- if: matrix.os == 'ubuntu-22.04'
name: Run tests
run: bundle exec rake ci:local_transport:linux
- if: matrix.os == 'windows-latest'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
scan:
name: Mend Scanning
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: checkout repo content
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
linux:
name: Linux
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
ruby: [3.1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/orch_transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
name: Tests
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-notes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

release-notes:
name: Release Notes
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/schemas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

generate:
name: Generate
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ssh_transport.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
jobs:
ssh_transport:
name: SSH Transport
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
ruby: [3.1]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
name: Unit
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-22.04, windows-latest]
ruby: [3.1]
runs-on: ${{ matrix.os }}
steps:
Expand Down
1 change: 0 additions & 1 deletion spec/integration/cli/cli_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,6 @@ def cli_loaded_features
# orchestrator client + dependencies
'orchestrator_client',
'faraday',
'multipart-post',
# httpclient + dependencies
'httpclient',
# locale + dependencies
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/outputter/human_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@

it "prints empty results from a plan" do
outputter.print_plan_result(Bolt::PlanResult.new([], 'success'))
expect(output.string).to eq("[\n\n]\n")
expect(output.string).to eq("[]\n")
end

it "formats unwrapped ExecutionResult from a plan" do
Expand Down
Loading