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

Merge main into v1 #758

Merged
merged 15 commits into from
Oct 5, 2021
Merged

Merge main into v1 #758

merged 15 commits into from
Oct 5, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 4, 2021

Merging ef3290c into v1

Conductor for this PR is @edoardopirovano

Contains the following pull requests:

Please review the following:

  • The CHANGELOG displays the correct version and date.
  • The CHANGELOG includes all relevant, user-facing changes since the last release.
  • There are no unexpected commits being merged into the v1 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.

@aeisenberg aeisenberg marked this pull request as ready for review October 4, 2021 21:12
@aeisenberg aeisenberg requested a review from a team as a code owner October 4, 2021 21:12
@aeisenberg
Copy link
Contributor

Hmmm... check-expected-release-files is set as a required check, but it doesn't always run. So this PR is hanging.

@aeisenberg
Copy link
Contributor

I removed the job as a required one. The main branch doesn't require it.

@aeisenberg aeisenberg closed this Oct 4, 2021
auto-merge was automatically disabled October 4, 2021 23:01

Pull request was closed

@aeisenberg aeisenberg reopened this Oct 4, 2021
@edoardopirovano
Copy link
Contributor

Would you mind if I merge this in my morning @aeisenberg? There's a couple of changes around how we use the CLI that have the potential to be a bit scary, so I'd like to be around after it's merged in case something goes wrong.

I'm sure everything is okay because our tests seem fine and semmle-code has been using the changes, but just in case.

@aeisenberg
Copy link
Contributor

Sure thing.

@edoardopirovano
Copy link
Contributor

Bumped the date in the CHANGELOG to today, now merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants