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 #585

Merged
merged 29 commits into from
Jun 23, 2021
Merged

Merge main into v1 #585

merged 29 commits into from
Jun 23, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jun 23, 2021

Merging d623a7a into v1

Conductor for this PR is @aeisenberg

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.

robertbrignull and others added 29 commits June 10, 2021 16:09
Check if on default branch before uploading database
Upload CodeQL databases - mk2
Update CodeQL bundle to 20210622 / 2.5.6
The changelog for an empty version will now be:

```
No user facing changes.
```

And this will appear in the final changelog when there is an actual release.
The benefits are that users will see regular release cycles and know
how old versions are even if there's no changes for a particular version

If we find that we are going months without any user facing changes, but
we have non-visible changes, then we can rethink this strategy.
But I think this is nicer than having empty sections for a version.
Copy link
Contributor

@edoardopirovano edoardopirovano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM. Was the decision to not include a changelog entry for uploading databases a deliberate one since external users do not have a use for this yet? Seems reasonable but just checking this isn't an accident.

@robertbrignull
Copy link
Contributor

It was a conscious choice since it's not a user-facing feature yet. See #573 (review)

@robertbrignull
Copy link
Contributor

Ah good. Something went wrong and it didn't run any CI on that last commit. Closing and opening has prodded it into action.

@aeisenberg aeisenberg merged commit cf6e019 into v1 Jun 23, 2021
@aeisenberg aeisenberg deleted the update-v1.0.3-d623a7a3 branch June 23, 2021 14:55
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.

6 participants