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 releases/v2 into releases/v1 #1202

Merged
merged 17 commits into from
Aug 23, 2022
Merged

Conversation

henrymercer
Copy link
Contributor

@henrymercer henrymercer commented Aug 22, 2022

Merging 7fee4ca into releases/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 releases/v1 branch.
  • The docs team is aware of any documentation changes that need to be released.

dependabot bot and others added 16 commits August 18, 2022 19:26
Bumps [@actions/core](https://github.com/actions/toolkit/tree/HEAD/packages/core) from 1.4.0 to 1.9.1.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/main/packages/core/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/core)

---
updated-dependencies:
- dependency-name: "@actions/core"
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Mergeback v2.1.19 refs/heads/releases/v2 into main
Co-authored-by: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com>
…core-1.9.1

Bump @actions/core from 1.4.0 to 1.9.1
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>
…kage-conflicts

Make "Update release branch" workflow fail if `npm version` fails
…-7fee4ca03

# Conflicts:
#	node_modules/.package-lock.json
#	package-lock.json
#	package.json
@henrymercer henrymercer added the Update dependencies Trigger PR workflow to update dependencies label Aug 22, 2022
@henrymercer henrymercer self-assigned this Aug 22, 2022
@henrymercer henrymercer marked this pull request as ready for review August 22, 2022 12:44
@henrymercer henrymercer requested a review from a team as a code owner August 22, 2022 12:44
@henrymercer
Copy link
Contributor Author

Due to the bug in the last release (fixed here #1197), I had to create this one manually. @github/codeql-action-reviewers Please could one of you review? Thanks!

@github-actions github-actions bot removed the Update dependencies Trigger PR workflow to update dependencies label Aug 22, 2022
@henrymercer henrymercer marked this pull request as draft August 22, 2022 13:43
@henrymercer henrymercer marked this pull request as ready for review August 22, 2022 13:43
@henrymercer henrymercer merged commit d438a4b into releases/v1 Aug 23, 2022
@henrymercer henrymercer deleted the update-v1.1.20-7fee4ca03 branch August 23, 2022 11:41
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.

2 participants