diff options
| author | cthorn42 <christopher.thorn@puppet.com> | 2022-10-17 09:58:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-17 09:58:47 -0700 |
| commit | 6759abf9f5c578c93ad9cabc8b2b4161e213d8f1 (patch) | |
| tree | 06f326b5db672dc5309ec133c5d31bf7509505f9 | |
| parent | e352e7e99668be4615e8d82af769afcf48dbe8b3 (diff) | |
| parent | 7165b155a25b3a73ef4a33538d18943e007fba34 (diff) | |
| download | puppet-hosts_core-6759abf9f5c578c93ad9cabc8b2b4161e213d8f1.tar.gz puppet-hosts_core-6759abf9f5c578c93ad9cabc8b2b4161e213d8f1.tar.bz2 | |
Merge pull request #38 from mhashizume/PA-4691/main/macos_gha
(MODULES-11349) Updates macOS GitHub Actions runners
| -rw-r--r-- | .github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/unit_tests_with_nightly_puppet_gem.yaml | 4 | ||||
| -rw-r--r-- | .github/workflows/unit_tests_with_released_puppet_gem.yaml | 4 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .vscode/extensions.json | 6 |
5 files changed, 7 insertions, 12 deletions
diff --git a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml index 9cccb45..941c9f5 100644 --- a/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/daily_unit_tests_with_nightly_puppet_gem.yaml @@ -10,7 +10,7 @@ jobs: name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} strategy: matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] + os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2019' ] puppet_version: [ 6, 7 ] include: - puppet_version: 6 @@ -22,7 +22,7 @@ jobs: os_type: 'Linux' env_set_cmd: 'export ' gem_file: 'puppet-latest.gem' - - os: 'macos-10.15' + - os: 'macos-latest' os_type: 'macOS' env_set_cmd: 'export ' gem_file: 'puppet-latest-universal-darwin.gem' diff --git a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml index 86ec16a..af7e737 100644 --- a/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_nightly_puppet_gem.yaml @@ -12,7 +12,7 @@ jobs: name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} strategy: matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] + os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2019' ] puppet_version: [ 6, 7 ] include: - puppet_version: 6 @@ -24,7 +24,7 @@ jobs: os_type: 'Linux' env_set_cmd: 'export ' gem_file: 'puppet-latest.gem' - - os: 'macos-10.15' + - os: 'macos-latest' os_type: 'macOS' env_set_cmd: 'export ' gem_file: 'puppet-latest-universal-darwin.gem' diff --git a/.github/workflows/unit_tests_with_released_puppet_gem.yaml b/.github/workflows/unit_tests_with_released_puppet_gem.yaml index 5ac86dd..c316cb0 100644 --- a/.github/workflows/unit_tests_with_released_puppet_gem.yaml +++ b/.github/workflows/unit_tests_with_released_puppet_gem.yaml @@ -12,7 +12,7 @@ jobs: name: ${{ matrix.os_type }} / Puppet${{ matrix.puppet_version }} gem / Ruby ${{ matrix.ruby }} strategy: matrix: - os: [ 'ubuntu-18.04', 'macos-10.15', 'windows-2019' ] + os: [ 'ubuntu-18.04', 'macos-latest', 'windows-2019' ] puppet_version: [ 6, 7 ] include: - puppet_version: 6 @@ -22,7 +22,7 @@ jobs: - os: 'ubuntu-18.04' os_type: 'Linux' - - os: 'macos-10.15' + - os: 'macos-latest' os_type: 'macOS' - os: 'windows-2019' os_type: 'Windows' @@ -26,3 +26,4 @@ .envrc /inventory.yaml /spec/fixtures/litmus_inventory.yaml +/.vscode/ diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 2f1e4f7..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "recommendations": [ - "puppet.puppet-vscode", - "rebornix.Ruby" - ] -} |