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

Open
wants to merge 36 commits into
base: releases/v1
Choose a base branch
from

Conversation

github-actions[bot]
Copy link

Merging f20d5a7 into releases/v1

Conductor for this PR is @henrymercer

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 <[email protected]>
Re-enable waiting for processing by default, using the new API semantics.
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]>
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
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).
This check is primarily intended to validate that any merge conflicts in
the v2 -> v1 backport PR are fixed before the PR is merged.
…ge commit

This gives us slightly messier git history, but more importantly makes
reviewing substantially easier.
@henrymercer henrymercer marked this pull request as ready for review April 25, 2022 16:00
@henrymercer
Copy link
Contributor

This is a new example release PR to accompany review of github/codeql-action#1032.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants