Merge releases/v2 into releases/v1 #1408
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v2.1.34 refs/heads/releases/v2 into main
Removes the hotfix from #1257
python-setup: rely on new `virtualenv` for venv creation in Ubuntu 22.04
Previously, `isAnalyzingDefaultBranch` was failing because there are some missing env vars: `GITHUB_SHA`, `GITHUB_REF`, and `GITHUB_EVENT_PATH`. Also, `checkout_path` is missing as an input. Rather than trying to set them to mock values, which would require setting the paths to existing paths in the file system, I chose to stub the entire function. I think this is fine since the point of the test is to check the ram and threads values, not testing the `isAnalyzingDefaultBranch` function.
Fixes spurious error messages in tests
Merge main into releases/v2
This reverts commit 1b829d6.
This reverts commit 85b8c47.
github-actions
bot
added
the
Update dependencies
henrymercer
added
Update dependencies
github-actions
bot
removed
the
Update dependencies
henrymercer
approved these changes
Dec 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging b2a92eb into releases/v1
Conductor for this PR is @henrymercer.
Contains the following pull requests:
virtualenvfor venv creation in Ubuntu 22.04 #1402 (@RasmusWL)Please do the following:
Create a merge commitis selected rather thanSquash and mergeorRebase and merge.