Skip to content

Commit

Permalink
upgrade macos version (#10974) (#10980)
Browse files Browse the repository at this point in the history
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
#	.github/workflows/main.yml
  • Loading branch information
emmyoop authored Nov 6, 2024
1 parent 02634f3 commit c3f97d8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/actions/setup-postgres-macos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ jobs:
- python-version: 3.9
os: windows-latest
- python-version: 3.9
os: macos-12
os: macos-14

env:
TOXENV: integration
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-repeater.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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.'
Expand Down Expand Up @@ -100,7 +100,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)"
Expand Down

0 comments on commit c3f97d8

Please sign in to comment.