From ae0ae587ed46e1ae6e8607ea76fca62e5e05babf Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Wed, 6 Nov 2024 11:56:08 -0600 Subject: [PATCH] upgrade macos version (#10974) * upgrade to macos-latest * force link # Conflicts: # .github/actions/setup-postgres-macos/action.yml # .github/workflows/main.yml --- .github/actions/setup-postgres-macos/action.yml | 4 +++- .github/workflows/main.yml | 2 +- .github/workflows/test-repeater.yml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/actions/setup-postgres-macos/action.yml b/.github/actions/setup-postgres-macos/action.yml index af9a9fe1657..ebb818e78c4 100644 --- a/.github/actions/setup-postgres-macos/action.yml +++ b/.github/actions/setup-postgres-macos/action.yml @@ -5,7 +5,9 @@ runs: steps: - shell: bash run: | - brew services start postgresql + brew install postgresql@16 + brew link postgresql@16 --force + brew services start postgresql@16 echo "Check PostgreSQL service is running" i=10 COMMAND='pg_isready' diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5f94dfcdf9c..a80fcc99e66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -130,7 +130,7 @@ jobs: - python-version: 3.8 os: windows-latest - python-version: 3.8 - os: macos-12 + os: macos-14 env: TOXENV: integration diff --git a/.github/workflows/test-repeater.yml b/.github/workflows/test-repeater.yml index 315133336e8..28a43ac4803 100644 --- a/.github/workflows/test-repeater.yml +++ b/.github/workflows/test-repeater.yml @@ -36,7 +36,7 @@ on: type: choice options: - 'ubuntu-latest' - - 'macos-12' + - 'macos-14' - 'windows-latest' num_runs_per_batch: description: 'Max number of times to run the test per batch. We always run 10 batches.' @@ -101,7 +101,7 @@ jobs: # mac and windows don't use make due to limitations with docker with those runners in GitHub - name: "Set up postgres (macos)" - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-14' uses: ./.github/actions/setup-postgres-macos - name: "Set up postgres (windows)"