Merge releases/v2 into releases/v1 #5
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 <henrymercer@github.com>
Add codeql-python as CODEOWNERS
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).
…icts-in-releases Commit any conflicts during v1 backport to simplify release process
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
Henrymercer/use tags for releases
Merge main into releases/v2
This reverts commit f679ec9.
This reverts commit c7b049b.
added 2 commits
April 14, 2022 16:40
…6d3d43bc # Conflicts: # autobuild/action.yml
henrymercer
force-pushed
the
update-v1.1.9-6d3d43bc
branch
from
5e501b5
to
55e89ea
Compare
|
Fixed up the merge commit with |
|
Creating backlink to the external PR: github/codeql-action#1032 |
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 6d3d43b into releases/v1
Conductor for this PR is @henrymercer
Contains the following pull requests:
Please review the following:
autobuild/action.yml