Merge releases/v3 into releases/v2 #2336
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Mergeback v3.25.8 refs/heads/releases/v3 into main
Bumps the npm group with 5 updates: | Package | From | To | | --- | --- | --- | | [adm-zip](https://github.com/cthackers/adm-zip) | `0.5.13` | `0.5.14` | | [uuid](https://github.com/uuidjs/uuid) | `9.0.1` | `10.0.0` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.12.0` | `7.13.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.12.0` | `7.13.0` | | [eslint-plugin-github](https://github.com/github/eslint-plugin-github) | `5.0.0` | `5.0.1` | Updates `adm-zip` from 0.5.13 to 0.5.14 - [Release notes](https://github.com/cthackers/adm-zip/releases) - [Changelog](https://github.com/cthackers/adm-zip/blob/master/history.md) - [Commits](cthackers/adm-zip@v0.5.13...v0.5.14) Updates `uuid` from 9.0.1 to 10.0.0 - [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md) - [Commits](uuidjs/uuid@v9.0.1...v10.0.0) Updates `@typescript-eslint/eslint-plugin` from 7.12.0 to 7.13.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.13.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.12.0 to 7.13.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.13.0/packages/parser) Updates `eslint-plugin-github` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/github/eslint-plugin-github/releases) - [Commits](github/eslint-plugin-github@v5.0.0...v5.0.1) --- updated-dependencies: - dependency-name: adm-zip dependency-type: direct:production update-type: version-update:semver-patch dependency-group: npm - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-major dependency-group: npm - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: npm - dependency-name: eslint-plugin-github dependency-type: direct:development update-type: version-update:semver-patch dependency-group: npm ... Signed-off-by: dependabot[bot] <[email protected]>
…er-versions Update supported GitHub Enterprise Server versions
...but only if the feature exists in the CLI.
Use `--force-overwrite` for creating databases
This should stop
.github/workflows/script/update-node-modules.sh: line 1: [: missing `]'
This will help to avoid issues where the database cluster directory is left in an inconsistent state.
Fix bash syntax
…b9d28a Bump the npm group with 5 updates
Co-authored-by: Andrew Eisenberg <[email protected]>
Attempt to clean up the database cluster directory
Merge main into releases/v3
This reverts commit 52d2912.
This reverts commit 4103cca.
github-actions
bot
added
the
Update dependencies
github-actions
bot
removed
the
Update dependencies
|
Pushed a commit to update the checked-in dependencies. Please mark the PR as ready for review to trigger PR checks. |
henrymercer
approved these changes
Jun 12, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging 530d4fe into
releases/v2.Conductor for this PR is @henrymercer.
Contains the following pull requests:
--force-overwritefor creating databases #2330 (@aeisenberg)Please do the following:
releases/v2branch.Create a merge commitis selected rather thanSquash and mergeorRebase and merge.