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

[releases/1.0] Merge 1.0.1 changes into release branch #632

Merged
merged 4 commits into from
Sep 11, 2024

Conversation

bkeryan
Copy link
Collaborator

@bkeryan bkeryan commented Aug 30, 2024

What does this Pull Request accomplish?

Fast-forward merge the 1.0.1 changes into the releases/1.0 branch.

Why should this Pull Request be merged?

1.0.1 was released out of the wrong branch: it was released out of master, not releases/1.0. As a result, none of the 1.0.1 changes were cherry-picked to releases/1.0 prior to release.

We ought to release out of the release branches so that we can commit changes for the next release to master, but in this case there were no such changes, so let's just fix up the release branch.

What testing has been done?

None

Copy link

github-actions bot commented Aug 30, 2024

Test Results

    34 files  +    24      34 suites  +24   51m 56s ⏱️ + 48m 47s
 2 348 tests + 2 138   1 994 ✅ + 1 784    354 💤 +  354  0 ❌ ±0 
42 272 runs  +40 172  36 020 ✅ +33 920  6 252 💤 +6 252  0 ❌ ±0 

Results for commit 79df1b1. ± Comparison against base commit 53db026.

♻️ This comment has been updated with latest results.

@bkeryan bkeryan closed this Sep 10, 2024
@bkeryan bkeryan reopened this Sep 10, 2024
@bkeryan bkeryan closed this Sep 10, 2024
@bkeryan bkeryan reopened this Sep 10, 2024
@bkeryan
Copy link
Collaborator Author

bkeryan commented Sep 10, 2024

The checks were waiting for CI / Generate docs instead of CI / Generate docs / Generate docs. I updated the repo's required checks and closed/reopened the review. I hope this fixes it.

@bkeryan bkeryan merged commit f4698e3 into releases/1.0 Sep 11, 2024
62 checks passed
@bkeryan bkeryan deleted the users/bkeryan/update-releases-1.0 branch September 11, 2024 00:05
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.

4 participants