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.

Sign up for GitHub

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

Jump to bottom

Merge main into releases/v2 #1406

Merged
merged 10 commits into from
Dec 1, 2022
Merged

Merge main into releases/v2 #1406

merged 10 commits into from
Dec 1, 2022

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Dec 1, 2022 •
edited by henrymercer
Loading

Merging 9af9a11 into releases/v2

Conductor for this PR is @henrymercer.

Contains the following pull requests:

Please do the following:

  • Ensure the CHANGELOG displays the correct version and date.
  • Ensure the CHANGELOG includes all relevant, user-facing changes since the last release.
  • Check that there are not any unexpected commits being merged into the releases/v2 branch.
  • Ensure the docs team is aware of any documentation changes that need to be released.
  • Approve and merge this PR. Make sure Create a merge commit is selected rather than Squash and merge or Rebase and merge.
  • Merge the mergeback PR that will automatically be created once this PR is merged.
  • Merge the v1 release PR that will automatically be created once this PR is merged.

github-actions[bot] and others added 10 commits November 25, 2022 15:20
Update changelog and version after v2.1.34
8d8b898
Update checked-in dependencies
c6e756b
@alexet
Merge pull request #1396 from github/mergeback/v2.1.34-to-main-312e093a
9dac9f7 
Mergeback v2.1.34 refs/heads/releases/v2 into main
@RasmusWL
python-setup: rely on new virtualenv for venv creation in Ubuntu 22.04
c62445d 
Removes the hotfix from #1257
@RasmusWL
python-setup: Remove outdated comment
caf1c50
@RasmusWL
Merge pull request #1402 from github/rasmuswl/new-virtualenv
160613c 
python-setup: rely on new `virtualenv` for venv creation in Ubuntu 22.04
@aeisenberg
Fixes spurious error messages in tests
1384ce4 
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.
@aeisenberg
Merge pull request #1400 from github/aeisenberg/fix-test-error
a631f4b 
Fixes spurious error messages in tests
@angelapwen
Stop running fallback Go autobuild if database is finalized (#1405)
9af9a11
Update changelog for v2.1.35
075b74d
@henrymercer henrymercer marked this pull request as ready for review December 1, 2022 12:19
@henrymercer henrymercer requested review from a team as code owners December 1, 2022 12:19
@henrymercer henrymercer enabled auto-merge December 1, 2022 12:19
@henrymercer henrymercer merged commit b2a92eb into releases/v2 Dec 1, 2022
@henrymercer henrymercer deleted the update-v2.1.35-9af9a11d branch December 1, 2022 13:02
@github-actions github-actions bot mentioned this pull request Dec 1, 2022
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrymercer henrymercer henrymercer approved these changes

Assignees

@henrymercer henrymercer

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@henrymercer @alexet @RasmusWL @aeisenberg @angelapwen