Skip to content

Commit b01b3df

Browse files
authored
Merge pull request #625 from mhashizume/PA-4696/main/macos-gha
(MODULES-11345) Updates macOS GitHub Actions runners
2 parents fa44535 + d6a77ea commit b01b3df

5 files changed

+7
-12
lines changed

.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1111
strategy:
1212
matrix:
13-
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2022' ]
13+
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
1414
puppet_version: [ 6, 7 ]
1515
include:
1616
- puppet_version: 6
@@ -22,7 +22,7 @@ jobs:
2222
os_type: 'Linux'
2323
env_set_cmd: 'export '
2424
gem_file: 'puppet-latest.gem'
25-
- os: 'macos-10.15'
25+
- os: 'macos-latest'
2626
os_type: 'macOS'
2727
env_set_cmd: 'export '
2828
gem_file: 'puppet-latest-universal-darwin.gem'

.github/workflows/unit_tests_with_nightly_puppet_gem.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1313
strategy:
1414
matrix:
15-
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2022' ]
15+
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
1616
puppet_version: [ 6, 7 ]
1717
include:
1818
- puppet_version: 6
@@ -24,7 +24,7 @@ jobs:
2424
os_type: 'Linux'
2525
env_set_cmd: 'export '
2626
gem_file: 'puppet-latest.gem'
27-
- os: 'macos-10.15'
27+
- os: 'macos-latest'
2828
os_type: 'macOS'
2929
env_set_cmd: 'export '
3030
gem_file: 'puppet-latest-universal-darwin.gem'

.github/workflows/unit_tests_with_released_puppet_gem.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }}
1313
strategy:
1414
matrix:
15-
os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2022' ]
15+
os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2022' ]
1616
puppet_version: [ 6, 7 ]
1717
include:
1818
- puppet_version: 6
@@ -22,7 +22,7 @@ jobs:
2222

2323
- os: 'ubuntu-18.04'
2424
os_type: 'Linux'
25-
- os: 'macos-10.15'
25+
- os: 'macos-latest'
2626
os_type: 'macOS'
2727
- os: 'windows-2022'
2828
os_type: 'Windows'

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29+
.vscode/

.vscode/extensions.json

-6
This file was deleted.

0 commit comments

Comments
 (0)