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: define timeout on macOS #6618

Merged
merged 1 commit into from
Sep 24, 2022
Merged

ci: define timeout on macOS #6618

merged 1 commit into from
Sep 24, 2022

Conversation

mkniewallner
Copy link
Member

Pull Request Check List

Closes #6602.

Cache is never reused on macOS because we use timeout to validate cache healthiness, but timeout is not available on macOS. So as the command fails, we execute the condition after || that deletes the virtual env, meaning we never use the cache on macOS (this can easily be seen here for instance).

This PR is an alternative implementation to #6602 following some feedback received in the PR.

  • Added tests for changed code.
  • Updated documentation for changed code.

@mkniewallner mkniewallner added area/ci Related to CI/CD impact/backport Requires backport to stable branch backport/1.2 labels Sep 24, 2022
Co-authored-by: Bjorn Neergaard <[email protected]>
@mkniewallner mkniewallner mentioned this pull request Sep 24, 2022
2 tasks
@neersighted neersighted merged commit aee025e into python-poetry:master Sep 24, 2022
@poetry-bot
Copy link

poetry-bot bot commented Sep 24, 2022

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

Then, create a pull request where the base branch is 1.2 and the compare/head branch is backport-6618-to-1.2.

@mkniewallner mkniewallner deleted the timeout-ci-macos branch September 25, 2022 20:30
neersighted added a commit to python-poetry/cleo that referenced this pull request Sep 27, 2022
@neersighted neersighted added this to the 1.3 milestone Sep 29, 2022
mkniewallner added a commit to mkniewallner/poetry-core that referenced this pull request Oct 11, 2022
Co-authored-by: Bjorn Neergaard <[email protected]>
Applying the same fix as in
python-poetry/poetry#6618.
neersighted pushed a commit to python-poetry/poetry-core that referenced this pull request Oct 11, 2022
Co-authored-by: Bjorn Neergaard <[email protected]>
Applying the same fix as in
python-poetry/poetry#6618.
DavidVujic pushed a commit to DavidVujic/poetry-core that referenced this pull request Oct 16, 2022
Co-authored-by: Bjorn Neergaard <[email protected]>
Applying the same fix as in
python-poetry/poetry#6618.
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
area/ci Related to CI/CD impact/backport Requires backport to stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants