Browse Source

fix: use supported macOS and Salt versions in CI

pull/549/head
Sean Molenaar 1 year ago
parent
commit
0d7e4ff9ee
No account linked to committer's email address
5 changed files with 20 additions and 20 deletions
  1. +8
    -8
      .github/workflows/kitchen.macos.yml
  2. +1
    -1
      .github/workflows/kitchen.vagrant.yml
  3. +6
    -6
      kitchen.macos.yml
  4. +2
    -2
      kitchen.vagrant.yml
  5. +3
    -3
      kitchen.windows.yml

+ 8
- 8
.github/workflows/kitchen.macos.yml View File

@@ -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'
@@ -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'
@@ -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'

+ 1
- 1
.github/workflows/kitchen.vagrant.yml View File

@@ -9,7 +9,7 @@ env:

jobs:
test:
runs-on: 'macos-10.15'
runs-on: 'macos-12'
strategy:
fail-fast: false
matrix:

+ 6
- 6
kitchen.macos.yml View File

@@ -11,15 +11,15 @@ provisioner:
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

+ 2
- 2
kitchen.vagrant.yml View File

@@ -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
@@ -98,4 +98,4 @@ platforms:
# yamllint enable rule:line-length
verifier:
inputs:
saltmajorversion: 3004
saltmajorversion: 3006

+ 3
- 3
kitchen.windows.yml View File

@@ -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 `
@@ -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

Loading…
Cancel
Save