FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge releases/v2 into releases/v1 by github-actions[bot] · Pull Request #1048 · github/codeql-action · GitHub

Merge releases/v2 into releases/v1 - #1048

Merged
hmakholm merged 48 commits into
releases/v1from
update-v1.1.9-7502d6e9
Apr 27, 2022
Merged

hmakholm merged 48 commits into
releases/v1from
update-v1.1.9-7502d6e9

Conversation

github-actions Bot commented Apr 27, 2022
edited by hmakholm
Loading

Copy link
Copy Markdown
Contributor

Merging 7502d6e into releases/v1

Conductor for this PR is @hmakholm

Contains the following pull requests:

Please review the following:

  • You have added commits to this branch that resolve the merge conflicts in the following files:
    • autobuild/action.yml
  • Another maintainer has reviewed the additional commits you added to this branch to resolve the merge conflicts.
  • 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.

chrisgavin and others added 30 commits March 30, 2022 12:24
autobuild: add working-directory input
Co-authored-by: Henry Mercer <henrymercer@github.com>
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] <support@github.com>
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.
github-actions Bot added the Update dependencies Trigger PR workflow to update dependencies label Apr 27, 2022
hmakholm marked this pull request as ready for review April 27, 2022 18:34
hmakholm requested a review from a team as a code owner April 27, 2022 18:34
github-actions Bot removed the Update dependencies Trigger PR workflow to update dependencies label Apr 27, 2022
hmakholm merged commit 6c3ae45 into releases/v1 Apr 27, 2022
hmakholm deleted the update-v1.1.9-7502d6e9 branch April 27, 2022 20:39
This file contains hidden or 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
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.

9 participants


Back | FazBrowse Home | New Git URL