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

[Backport 1.2.latest] Partial parsing bug with empty schema file - ensure None is not passe… #6514

Merged
merged 4 commits into from
Jan 4, 2023

Conversation

gshank
Copy link
Contributor

@gshank gshank commented Jan 4, 2023

Description

Backport #6494

Checklist

…d to load_yaml_text (#6494) (#6505)

Co-authored-by: Gerda Shank <[email protected]>
(cherry picked from commit 6e9ff28)
@gshank gshank requested review from a team as code owners January 4, 2023 19:47
@cla-bot cla-bot bot added the cla:yes label Jan 4, 2023
@gshank gshank requested a review from leahwicz as a code owner January 4, 2023 20:05
@gshank gshank merged commit 45d5276 into 1.2.latest Jan 4, 2023
@gshank gshank deleted the backport-6505-to-1.2.latest branch January 4, 2023 20:37
@github-actions
Copy link
Contributor

github-actions bot commented Jan 4, 2023

The backport to 1.1.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.1.latest 1.1.latest
# Navigate to the new working tree
cd .worktrees/backport-1.1.latest
# Create a new branch
git switch --create backport-6514-to-1.1.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 45d5276114ca3969f77867fcd6b498a2d69922f9
# Push it to GitHub
git push --set-upstream origin backport-6514-to-1.1.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1.latest

Then, create a pull request where the base branch is 1.1.latest and the compare/head branch is backport-6514-to-1.1.latest.

gshank added a commit that referenced this pull request Jan 4, 2023
…sure None is not passe… (#6514)

Co-authored-by: Gerda Shank <[email protected]>
(cherry picked from commit 6e9ff28)

Co-authored-by: leahwicz <[email protected]>
gshank added a commit that referenced this pull request Jan 4, 2023
…sure None is not passe… (#6514)

Co-authored-by: Gerda Shank <[email protected]>
(cherry picked from commit 6e9ff28)

Co-authored-by: leahwicz <[email protected]>
leahwicz added a commit that referenced this pull request Jan 4, 2023
#6517)

* [Backport 1.0.latest] Partial parsing bug with empty schema file - ensure None is not passe… (#6514)

Co-authored-by: Gerda Shank <[email protected]>
(cherry picked from commit 6e9ff28)

Co-authored-by: leahwicz <[email protected]>

* Cleanup flags.py

* Change ubuntu-latest to ubuntu-20.04

* Change more ubuntu-latest to ubuntu-20.04

* Change ubuntu-latest in integration-test-matrix.js to ubuntu-20.04

Co-authored-by: leahwicz <[email protected]>
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.

2 participants