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

[FLINK-34282][docker] Merge commit 44f05828 (pre-FLINK-34282 dev-master) into dev-1.19 #179

Closed
wants to merge 78 commits into from

Conversation

XComp
Copy link
Contributor

@XComp XComp commented Feb 9, 2024

dev-1.19 was initially based on master (rather than dev-master). This doesn't match the development process described in the README.md and doesn't allow the proper creation of the Docker images for 1.19.

To fix this, I merged 44f0582 (pre-FLINK-34282 commit from dev-master) into dev-1.19. Merge was chosen in favor of a rebase and force-push to document the issue even though the history is kind of skrewed for dev-1.19.

zentol and others added 30 commits May 12, 2020 11:25
- remove generates/templates; these now reside in the development branches
- remove testing files; these now reside in the development branches
- update README.md to reflect new development/release workflow
Flink does not follow the major.minor.patch convention.
- we do not have a term for x.0.0
- x.y.0 is major
- x.y.z is minor
- branch creation for major releases
- testing updates for minor releases
Deprecate command `native-k8` and add preparation for pass-through mode.

This is to address the comments in the following docker-library/official-images PR.
docker-library/official-images#9249

This closes apache#50
alpinegizmo and others added 26 commits July 12, 2022 15:16
… all supported versions point to the right dev-* branches

1.15 is left in there for now because we might want to release 1.15.5
- Adds item check for `.github/workflows/snapshot.yml`
- Adds item updating the .github/workflows/snapshot.yml
- Updated the instructions on how to create a branch (following what's already documented in the Flink release docs).
- Removed step in checklist to update the aliases array in generate-stackbrew-library.sh: This became obsolete with the changes that happened in e47a802
- Moved step describing the Flink minor version branch creation and updated it slightly to match the release documentation
- Removed step for updating the base version in testing/run_travis_tests.sh: This is obsolete with the changes that were done in FLINK-27488
- Removed step asking to update the latest tag in the script: This is not necessary anymore after the changes that have been committed with e47a802.
…r) into dev-1.19

dev-1.19 was initially based on master (rather than dev-master). This doesn't match the development process described in the README.md and doesn't allow the proper creation of the Docker images for 1.19.

To fix this, I merged 44f0582 (pre-FLINK-34282 commit from dev-master) into dev-1.19. Merge was chosen in favor of a rebase and force-push to document the issue even though the history is kind of skrewed for dev-1.19.
@XComp
Copy link
Contributor Author

XComp commented Feb 9, 2024

hm, handling the merge commit through GitHub seems to be not working as expected. I'm gonna close this PR and move the discussion into FLINK-34282

@XComp
Copy link
Contributor Author

XComp commented Feb 9, 2024

This merge commit PR can be closed. I force-pushed a rebase to {{dev-master~1}} (44f05828) after a brief discussion in FLINK-34282

@XComp XComp closed this Feb 9, 2024
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.