Skip to content

main: port from dev #4481

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

Merged
merged 1 commit into from
Mar 22, 2025
Merged

main: port from dev #4481

merged 1 commit into from
Mar 22, 2025

Conversation

ralfhandl
Copy link
Contributor

@ralfhandl ralfhandl commented Mar 20, 2025

Port workflows and scripts from dev to avoid:

  • breaking scripts on dev when changing something on `main,
  • possible problems with merging release branches.

The four changed files contain the contents from dev, the deleted file was already deleted on dev.

Tick one of the following options:

  • schema changes are included in this pull request
  • schema changes are needed for this pull request but not done yet
  • no schema changes are needed for this pull request

@ralfhandl ralfhandl requested review from a team as code owners March 20, 2025 18:36
@ralfhandl ralfhandl added script Pull requests that update Bash or JavaScript code approved pr port PRs that just port an approved PR to another version Housekeeping labels Mar 20, 2025
@miqui miqui merged commit e09c356 into OAI:main Mar 22, 2025
2 checks passed
@ralfhandl ralfhandl deleted the main-sync-scripts-from-dev branch March 24, 2025 08:12
@duncanbeevers
Copy link
Contributor

duncanbeevers commented Mar 25, 2025

Why did this get merged? We pushed back on these changes a couple of weeks ago in this PR.

@ralfhandl Is there something different in this PR than in #4400?
I don't understand why what seems like the same changes were opened again and pushed through without discussion.

This changes the entire workflow for these scripts. Making changes to them now requires making those changes on main, but without being able to test those changes on main!
Or else doing this dance of making the changes on dev and manually back-porting them to main.

@ralfhandl
Copy link
Contributor Author

When we release, we will create a vX.Y.Z-rel branch from vX.Y-dev, rename src/oas.md to versions/X.Y.Z.md, then merge the rel branch into main.

That will bring any script changes on dev back to main.

This flow is described now in CONTRIBUTING.md.

This PR just sped up the inevitable and made sure that the scripts are in sync across branches, and that the automated sync PRs don't accidentally propagate outdated scripts from main.

Mid-term the scripts will become wrappers that just call the actual code in from a separate repo. Then any changes to the centralized scripts will become immediately available on all branches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved pr port PRs that just port an approved PR to another version Housekeeping script Pull requests that update Bash or JavaScript code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants