From c45bcc9a055ce5adf8c2dc1b2efa02802acef897 Mon Sep 17 00:00:00 2001 From: Fraser Waters Date: Wed, 26 Oct 2022 10:59:16 +0100 Subject: [PATCH] Replace macos-latest with macos-11 GitHub are rolling out macos 12 for the -latest image (https://github.com/actions/runner-images/issues/6384), but we need to continue to support and build for macos 11. Fixes https://github.com/pulumi/pulumi/issues/11152 --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/download-pulumi-cron.yml | 8 ++++---- .github/workflows/on-pr.yml | 2 +- ...-fix-release-build-to-continue-to-use-macos-11.yaml | 4 ++++ scripts/get-job-matrix.py | 2 +- 5 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 changelog/pending/20221026--build--fix-release-build-to-continue-to-use-macos-11.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c417763f9f10..4914670397b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: @@ -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 @@ -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 != '{}' }} diff --git a/.github/workflows/download-pulumi-cron.yml b/.github/workflows/download-pulumi-cron.yml index 1d95ee70b29f..753f45ddd02f 100644 --- a/.github/workflows/download-pulumi-cron.yml +++ b/.github/workflows/download-pulumi-cron.yml @@ -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 @@ -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}" @@ -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" @@ -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 diff --git a/.github/workflows/on-pr.yml b/.github/workflows/on-pr.yml index ced24bd2d877..7c02ca7c34b6 100644 --- a/.github/workflows/on-pr.yml +++ b/.github/workflows/on-pr.yml @@ -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 diff --git a/changelog/pending/20221026--build--fix-release-build-to-continue-to-use-macos-11.yaml b/changelog/pending/20221026--build--fix-release-build-to-continue-to-use-macos-11.yaml new file mode 100644 index 000000000000..6aa75220e9ee --- /dev/null +++ b/changelog/pending/20221026--build--fix-release-build-to-continue-to-use-macos-11.yaml @@ -0,0 +1,4 @@ +changes: +- type: fix + scope: build + description: Fix release build to continue to use MacOS 11. diff --git a/scripts/get-job-matrix.py b/scripts/get-job-matrix.py index 8d4aeb6bbc2d..f29024613221 100755 --- a/scripts/get-job-matrix.py +++ b/scripts/get-job-matrix.py @@ -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 = {