Skip to content

Merge main into releases/v2 #4

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 18 commits into from
Apr 14, 2022
Merged

Merge main into releases/v2 #4

merged 18 commits into from
Apr 14, 2022

Conversation

@github-actions
Copy link

Merging 8aff92c into releases/v2

Conductor for this PR is @henrymercer

Contains the following pull requests:

Contains the following commits not from a pull request:

Please review the following:

  • 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/v2 branch.
  • The docs team is aware of any documentation changes that need to be released.
  • The mergeback PR is merged back into main after this PR is merged.
  • The v1 release PR is merged after this PR is merged.

github-actions[bot] and others added 18 commits April 8, 2022 08:46
Update changelog and version after v2.1.8
792bbfe
Update checked-in dependencies
0c80741
@edoardopirovano
Merge pull request #1029 from github/mergeback/v2.1.8-to-main-1ed14374
2d80fe8 
Mergeback v2.1.8 refs/heads/v2 into main
@cklin
autobuild: add working-directory input
b0c570e
@cklin
Add autobuild workind-directory test
6f17408
@cklin
Merge pull request #1024 from cklin/autobuild-working-dir
baf90d1 
autobuild: add working-directory input
@RasmusWL
Add codeql-python as CODEOWNERS
780f4ee
@RasmusWL @henrymercer
Update CODEOWNERS
9f20add 
Co-authored-by: Henry Mercer <henrymercer@github.com>
@henrymercer
Merge pull request #1030 from github/RasmusWL/pyton-setup-codeowners
7a12645 
Add codeql-python as CODEOWNERS
@henrymercer
Commit any conflicts during v1 backport to simplify release process
f6312f1 
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).
@henrymercer
Merge pull request #1 from dsp-testing/henrymercer/handle-merge-confl…
bb1ef50 
…icts-in-releases

Commit any conflicts during v1 backport to simplify release process
@henrymercer
Update description of "Tag release and merge back" workflow
26174d0
@henrymercer
Update the major version tag within the release process
104eab1
@henrymercer
Improve consistency of variable references in Bash
a5cdcfa
@henrymercer
Update references to release branches
0207209 
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
@henrymercer
Remove fork guards in Actions
74d33fe
@henrymercer
Merge pull request #2 from dsp-testing/henrymercer/use-tags-for-releases
8aff92c 
Henrymercer/use tags for releases
Update changelog for v2.1.9
5c7e3cc
@henrymercer henrymercer marked this pull request as ready for review April 14, 2022 15:25
@henrymercer henrymercer merged commit 6d3d43b into releases/v2 Apr 14, 2022
@github-actions github-actions bot mentioned this pull request Apr 14, 2022
Merged
6 tasks
This was referenced Apr 25, 2022
Merged
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@henrymercer henrymercer

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@henrymercer @edoardopirovano @cklin @RasmusWL