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

fix: use supported macOS and Salt versions in CI #549

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 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
16 changes: 8 additions & 8 deletions .github/workflows/kitchen.macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ env:
KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'

jobs:
test-12:
test-13:
runs-on: 'macos-12'
strategy:
fail-fast: false
matrix:
instance:
- default-macos-12-latest-py3
- default-macos-13-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
Expand All @@ -31,13 +31,13 @@ jobs:
bundle install --jobs 4 --retry 3
- name: 'Run Test Kitchen'
run: 'bundle exec kitchen verify ${{ matrix.instance }}'
test-11:
runs-on: 'macos-11'
test-12:
runs-on: 'macos-12'
strategy:
fail-fast: false
matrix:
instance:
- default-macos-11-latest-py3
- default-macos-12-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
Expand All @@ -54,13 +54,13 @@ jobs:
bundle install --jobs 4 --retry 3
- name: 'Run Test Kitchen'
run: 'bundle exec kitchen verify ${{ matrix.instance }}'
test-1015:
runs-on: 'macos-10.15'
test-11:
runs-on: 'macos-11'
strategy:
fail-fast: false
matrix:
instance:
- default-macos-1015-latest-py3
- default-macos-11-latest-py3
steps:
- name: 'Check out code'
uses: 'actions/checkout@v2'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/kitchen.vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:

jobs:
test:
runs-on: 'macos-10.15'
runs-on: 'macos-12'
strategy:
fail-fast: false
matrix:
Expand Down
14 changes: 7 additions & 7 deletions kitchen.macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ driver:
provisioner:
sudo: true
salt_install: bootstrap
salt_bootstrap_options: -P stable latest
salt_bootstrap_options: -P stable 3006.1
SMillerDev marked this conversation as resolved.
Show resolved Hide resolved
salt_call_command: /opt/salt/bin/salt-call

platforms:
- name: macos-12-latest-py3
- name: macos-13-latest-py3
verifier:
inputs:
saltmajorversion: 3004
- name: macos-11-latest-py3
saltmajorversion: 3006
- name: macos-12-latest-py3
verifier:
inputs:
saltmajorversion: 3004
- name: macos-1015-latest-py3
saltmajorversion: 3006
- name: macos-11-latest-py3
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006
4 changes: 2 additions & 2 deletions kitchen.vagrant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ platforms:
# yamllint enable rule:line-length
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006
- name: windows-81-latest-py3
driver:
box: techneg/win81x64-pro-salt
Expand All @@ -98,4 +98,4 @@ platforms:
# yamllint enable rule:line-length
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006
6 changes: 3 additions & 3 deletions kitchen.windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ driver:

provisioner:
salt_install: bootstrap
salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1
salt_bootstrap_options: -version latest
# yamllint disable rule:line-length
init_environment: |
salt-call --local state.single file.managed `
Expand All @@ -24,8 +24,8 @@ platforms:
- name: windows-2022-latest-py3
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006
- name: windows-2019-latest-py3
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006