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

Merged
merged 17 commits into from
May 31, 2021
Merged

Merge main into v1 #533

merged 17 commits into from
May 31, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 31, 2021

Merging ff75ec7 into v1

Conductor for this PR is @henrymercer

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.

aibaars and others added 16 commits May 21, 2021 18:45
This commit ensures that the changelog is updated before a release with
the correct date and version.

Also, after a release, a mergeback PR is created to ensure that the
changelog update and version bump is available in main.
Don't run the cron workflow on forks, since they lack the necessary secrets.
…ersions-upstream-only

Actions: Run enterprise versions workflow only on the parent repo
Add Ruby as a possible language
Ensures that the runner version is bumped along with the action version.
…lease

Add release and mergeback workflows
…stom-queries

Analyze: Log analysis summaries for custom queries
Minor change.
@aeisenberg aeisenberg enabled auto-merge May 31, 2021 15:12
@aeisenberg aeisenberg merged commit 4917d3c into v1 May 31, 2021
@aeisenberg aeisenberg deleted the update-v1.0.0-ff75ec7f branch May 31, 2021 15:13
@aeisenberg
Copy link
Contributor

Hmmm...the mergeback PR wasn't created. I need to figure out why. Looks like the version wasn't bumped.

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.

4 participants