Merge main into releases/v2 #1046
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 v2.1.8 refs/heads/v2 into main
autobuild: add working-directory input
Co-authored-by: Henry Mercer <[email protected]>
Add codeql-python as CODEOWNERS
Re-enable waiting for processing by default, using the new API semantics.
The process of creating the v1 release can run into merge conflicts. We commit the unresolved conflicts so a maintainer can easily resolve them (vs erroring and requiring maintainers to reconstruct the release manually).
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
Bumps [glob](https://github.com/isaacs/node-glob) from 7.1.7 to 8.0.1. - [Release notes](https://github.com/isaacs/node-glob/releases) - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](isaacs/node-glob@v7.1.7...v8.0.1) --- updated-dependencies: - dependency-name: glob dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>
Bump glob from 7.1.7 to 8.0.1
This check is primarily intended to validate that any merge conflicts in the v2 -> v1 backport PR are fixed before the PR is merged.
As previously written, if codeql finds a `Pipfile`, but no `Pipfile.lock`, it will run `pipenv install` with args that require `Pipfile.lock` to exist. Pipfile will fail with this message: ``` Usage: python -m pipenv install [OPTIONS] [PACKAGES]... ERROR:: Pipfile.lock must exist to use --keep-outdated! package installation with pipenv failed, see error above ``` This changeset enables auto_install to work with Pipfile when there is no lock. (Bonus: `--skip-lock` is generally a bit faster.)
Specify releases of the CodeQL Action using tags instead of branches
…ge commit This gives us slightly messier git history, but more importantly makes reviewing substantially easier.
Bump default CodeQL version to 2.9.0
git.io is deprecated, so use the full link to docs.github.com instead.
…ts-in-releases Commit any conflicts during v1 backport to simplify release process
README: Replace git.io shortlink with full link
Fix status reporting error on Windows
hmakholm
approved these changes
Apr 27, 2022
aeisenberg
approved these changes
Apr 27, 2022
7 tasks
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 7286114 into releases/v2
Conductor for this PR is @hmakholm
Contains the following pull requests:
Please review the following: