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

ci: Bump macOS dependencies again #1583

Merged
merged 2 commits into from
Oct 7, 2022

Conversation

paulgessinger
Copy link
Member

This is because the python version got out of sync again.

This is because the python version got out of sync again.
@paulgessinger paulgessinger added this to the next milestone Oct 7, 2022
@paulgessinger
Copy link
Member Author

/cc @tboldagh @benjaminhuth @andiwand

@tboldagh
Copy link
Contributor

tboldagh commented Oct 7, 2022

Will CI in other PR be rerun automagically?

@andiwand andiwand self-requested a review October 7, 2022 08:07
@andiwand andiwand self-assigned this Oct 7, 2022
@paulgessinger
Copy link
Member Author

@tboldagh only when they get updated to latest main

@codecov
Copy link

codecov bot commented Oct 7, 2022

Codecov Report

Merging #1583 (069be12) into main (f7c5dce) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1583   +/-   ##
=======================================
  Coverage   48.58%   48.58%           
=======================================
  Files         381      381           
  Lines       20727    20727           
  Branches     9497     9497           
=======================================
  Hits        10070    10070           
  Misses       4110     4110           
  Partials     6547     6547           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@andiwand
Copy link
Contributor

andiwand commented Oct 7, 2022

I will try to add a stable python build to the macos dependencies acts-project/ci-dependencies#12

@kodiakhq kodiakhq bot merged commit 465fe6f into acts-project:main Oct 7, 2022
@github-actions github-actions bot removed the automerge label Oct 7, 2022
@paulgessinger paulgessinger added the backport develop/v19.x Backport this PR to the v19.x series label Oct 7, 2022
@paulgessinger paulgessinger deleted the macos-deps branch October 7, 2022 13:34
@acts-project-service
Copy link
Collaborator

The backport to develop/v19.x 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-develop/v19.x develop/v19.x
# Navigate to the new working tree
cd .worktrees/backport-develop/v19.x
# Create a new branch
git switch --create backport-1583-to-develop/v19.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 465fe6fa692aa672091c8eb1dac02a28abeb015c
# Push it to GitHub
git push --set-upstream origin backport-1583-to-develop/v19.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-develop/v19.x

Then, create a pull request where the base branch is develop/v19.x and the compare/head branch is backport-1583-to-develop/v19.x.

paulgessinger added a commit to paulgessinger/acts that referenced this pull request Oct 7, 2022
This is because the python version got out of sync again.
kodiakhq bot pushed a commit that referenced this pull request Oct 7, 2022
…1586)

Backport of 465fe6f from #1583 
---
This is because the python version got out of sync again.
@paulgessinger paulgessinger modified the milestones: next, v20.3.0 Oct 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport develop/v19.x Backport this PR to the v19.x series
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants