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

upgrade macos version #10974

Merged
merged 2 commits into from
Nov 6, 2024
Merged

upgrade macos version #10974

merged 2 commits into from
Nov 6, 2024

Conversation

emmyoop
Copy link
Member

@emmyoop emmyoop commented Nov 4, 2024

Problem

We're using macos-12 in CI and it's currently in a brownout to be fully deprecated beginning of December.

Solution

Upgrade CI.

Checklist

  • I have read the contributing guide and understand what's expected of me.
  • I have run this code in development, and it appears to resolve the stated issue.
  • This PR includes tests, or tests are not required or relevant for this PR.
  • This PR has no interface changes (e.g., macros, CLI, logs, JSON artifacts, config files, adapter interface, etc.) or this PR has already received feedback and approval from Product or DX.
  • This PR includes type annotations for new and modified functions.

@cla-bot cla-bot bot added the cla:yes label Nov 4, 2024
Copy link

codecov bot commented Nov 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.08%. Comparing base (bdf28d7) to head (48499f1).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #10974      +/-   ##
==========================================
- Coverage   89.14%   89.08%   -0.06%     
==========================================
  Files         183      183              
  Lines       23553    23553              
==========================================
- Hits        20996    20983      -13     
- Misses       2557     2570      +13     
Flag Coverage Δ
integration 86.38% <ø> (-0.13%) ⬇️
unit 62.76% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
Unit Tests 62.76% <ø> (ø)
Integration Tests 86.38% <ø> (-0.13%) ⬇️

@emmyoop emmyoop force-pushed the er/macos-ci branch 2 times, most recently from 6536e9f to 54f5378 Compare November 4, 2024 20:49
@emmyoop emmyoop marked this pull request as ready for review November 4, 2024 21:02
@emmyoop emmyoop requested a review from a team as a code owner November 4, 2024 21:02
Copy link
Member

@aranke aranke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@emmyoop emmyoop merged commit 0c51985 into main Nov 6, 2024
58 of 59 checks passed
@emmyoop emmyoop deleted the er/macos-ci branch November 6, 2024 17:56
Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 1.8.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.8.latest 1.8.latest
# Navigate to the new working tree
cd .worktrees/backport-1.8.latest
# Create a new branch
git switch --create backport-10974-to-1.8.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c51985c8388dab210a8fb659b08b7cb14bc3427
# Push it to GitHub
git push --set-upstream origin backport-10974-to-1.8.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.8.latest

Then, create a pull request where the base branch is 1.8.latest and the compare/head branch is backport-10974-to-1.8.latest.

Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 1.7.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.7.latest 1.7.latest
# Navigate to the new working tree
cd .worktrees/backport-1.7.latest
# Create a new branch
git switch --create backport-10974-to-1.7.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c51985c8388dab210a8fb659b08b7cb14bc3427
# Push it to GitHub
git push --set-upstream origin backport-10974-to-1.7.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.7.latest

Then, create a pull request where the base branch is 1.7.latest and the compare/head branch is backport-10974-to-1.7.latest.

Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 1.5.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.5.latest 1.5.latest
# Navigate to the new working tree
cd .worktrees/backport-1.5.latest
# Create a new branch
git switch --create backport-10974-to-1.5.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c51985c8388dab210a8fb659b08b7cb14bc3427
# Push it to GitHub
git push --set-upstream origin backport-10974-to-1.5.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.5.latest

Then, create a pull request where the base branch is 1.5.latest and the compare/head branch is backport-10974-to-1.5.latest.

Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 1.6.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.6.latest 1.6.latest
# Navigate to the new working tree
cd .worktrees/backport-1.6.latest
# Create a new branch
git switch --create backport-10974-to-1.6.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c51985c8388dab210a8fb659b08b7cb14bc3427
# Push it to GitHub
git push --set-upstream origin backport-10974-to-1.6.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.6.latest

Then, create a pull request where the base branch is 1.6.latest and the compare/head branch is backport-10974-to-1.6.latest.

Copy link
Contributor

github-actions bot commented Nov 6, 2024

The backport to 1.4.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.4.latest 1.4.latest
# Navigate to the new working tree
cd .worktrees/backport-1.4.latest
# Create a new branch
git switch --create backport-10974-to-1.4.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0c51985c8388dab210a8fb659b08b7cb14bc3427
# Push it to GitHub
git push --set-upstream origin backport-10974-to-1.4.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.4.latest

Then, create a pull request where the base branch is 1.4.latest and the compare/head branch is backport-10974-to-1.4.latest.

emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
#	.github/workflows/main.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
#	.github/workflows/main.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
emmyoop added a commit that referenced this pull request Nov 6, 2024
* upgrade to macos-latest

* force link
# Conflicts:
#	.github/actions/setup-postgres-macos/action.yml
#	.github/workflows/main.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants