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

Replace macos-latest with macos-11 #11155

Merged
merged 1 commit into from Oct 26, 2022
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Expand Up @@ -36,7 +36,7 @@ on:
type: string
smoke-test-platforms:
required: false
default: windows-latest macos-latest
default: windows-latest macos-11
description: Platforms on which to run integration tests, as a space delimited list
type: string
enable-coverage:
Expand Down Expand Up @@ -115,8 +115,8 @@ jobs:
{ "os": "linux", "arch": "arm64", "build-platform": "ubuntu-latest" },
{ "os": "windows", "arch": "amd64", "build-platform": "ubuntu-latest" },
{ "os": "windows", "arch": "arm64", "build-platform": "ubuntu-latest" },
{ "os": "darwin", "arch": "amd64", "build-platform": "macos-latest" },
{ "os": "darwin", "arch": "arm64", "build-platform": "macos-latest" }
{ "os": "darwin", "arch": "amd64", "build-platform": "macos-11" },
{ "os": "darwin", "arch": "arm64", "build-platform": "macos-11" }
]'
fi

Expand Down Expand Up @@ -236,10 +236,10 @@ jobs:
unit-test:
# By putting a variable in the name, we remove GitHub's auto-generated matrix parameters from
# appearing in the rendered title of the job name: It changes this:
# CI / Unit Test (cd sdk/dotnet && make dotnet_test, cd sdk/dotnet && make dotnet_test, macos-latest, mi... / sdk/dotnet dotnet_test on macos-latest/current
# CI / Unit Test (cd sdk/dotnet && make dotnet_test, cd sdk/dotnet && make dotnet_test, macos-11, mi... / sdk/dotnet dotnet_test on macos-11/current
# (See: https://github.com/pulumi/pulumi/runs/8241055084?check_suite_focus=true#logs)
# To this:
# CI / Unit Test / sdk/dotnet dotnet_test on macos-latest/current
# CI / Unit Test / sdk/dotnet dotnet_test on macos-11/current
name: Unit Test${{ matrix.platform && '' }}
needs: [matrix]
if: ${{ needs.matrix.outputs.unit-test-matrix != '{}' }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/download-pulumi-cron.yml
Expand Up @@ -11,7 +11,7 @@ defaults:
jobs:
macos-homebrew-install:
name: Install Pulumi with Homebrew on macOS
runs-on: macos-latest
runs-on: macos-11
steps:
- name: homedate homebrew formulae
run: brew update
Expand All @@ -29,7 +29,7 @@ jobs:
exit 1
macOS-direct-install:
name: Install Pulumi via script on macOS
runs-on: macos-latest
runs-on: macos-11
steps:
- run: curl -fsSL https://get.pulumi.com | sh
- run: echo "/Users/runner/.pulumi/bin" >> "${GITHUB_PATH}"
Expand All @@ -46,7 +46,7 @@ jobs:
exit 1
macos-verify-download-link:
name: Verify Direct Download link on macOS
runs-on: macos-latest
runs-on: macos-11
steps:
- name: Direct Download
run: curl -L -o pulumi.tar.gz "https://get.pulumi.com/releases/sdk/pulumi-v$(curl -sS https://www.pulumi.com/latest-version)-darwin-x64.tar.gz"
Expand Down Expand Up @@ -167,7 +167,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest", "macos-latest"]
os: ["ubuntu-latest", "windows-latest", "macos-11"]
steps:
- name: Install Pulumi CLI
uses: pulumi/action-install-pulumi-cli@v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-pr.yml
Expand Up @@ -57,7 +57,7 @@ jobs:
smoke-test-platforms: >- # No newlines or trailing newline.
${{
contains(github.event.pull_request.labels.*.name, 'ci/test')
&& 'macos-latest windows-latest'
&& 'macos-11 windows-latest'
|| ''
}}
enable-coverage: true
Expand Down
@@ -0,0 +1,4 @@
changes:
- type: fix
scope: build
description: Fix release build to continue to use MacOS 11.
2 changes: 1 addition & 1 deletion scripts/get-job-matrix.py
Expand Up @@ -90,7 +90,7 @@ class MakefileTest(TypedDict):
{"name": "sdk/nodejs sxs_tests", "run": "cd sdk/nodejs && ../../scripts/retry make sxs_tests", "eta": 3},
]

ALL_PLATFORMS = ["ubuntu-latest", "windows-latest", "macos-latest"]
ALL_PLATFORMS = ["ubuntu-latest", "windows-latest", "macos-11"]


MINIMUM_SUPPORTED_VERSION_SET = {
Expand Down