Skip to content

Commit dbc04cb

Browse files
nightkrdervoetiNickLarsenNZ
committed
Patchable (#1003)
* Add authorship information to Druid 26.0.0 patches * Add patchable checkout script * Add patchable export script, convert Druid 26.0.0 patches to patchable * Scrub commit IDs * Remove patch count from header * Add test patches * Rebase in test patch * Add docs * fix: patchable worktree initialization (#977) * Start rewriting patchable in Rust * Logging * Fix broken initial checkout * Fetch commits individually from upstream instead of cloning * Make commit IDs deterministic * Reimplement git-am for better determinism * Mailsplit each patch file separately * Simplify worktree checkout logic a bit * Forward logging from libgit2 * Normalize commits before exporting * Factor out implementation details from main() * Modularize * Start handling errors * Factor out patch mail parsing * More error handling * Snafuize the remaining errors * Shrink the error types a bit * Move patchable to rust/patchable for consistency * Docs * Remove obsolete patchable.nu * Add patchable init * Enforce that base must be a commit ID in patchable.toml * Ensure that init always fetches base from upstream * Print worktree directory on checkout Also move logs to stderr to avoid confusion * Document how to rebase patch series * Remove dummy patches * Documentation and cleanup * Remove git version suffix from patches * Skip comments in series file * Document how to import invalid patch series into patchable * More documentation * Add openssl to shell.nix * Reword docs following @soenkeliebau's comments #1003 (comment) * Then begone * Changelog * Fix gitignore EOLs * Update README.md Co-authored-by: Nick <[email protected]> * Update README.md Co-authored-by: Nick <[email protected]> * Fix FMPP update patch metadata --------- Co-authored-by: Lukas Krug <[email protected]> Co-authored-by: Nick <[email protected]>
1 parent 5e4e9f3 commit dbc04cb

26 files changed

+2784
-43
lines changed

.cargo/config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[alias]
2+
patchable = ["run", "--bin", "patchable", "--"]

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
# Byte-compiled / optimized / DLL files
1+
# compiled / optimized files
22
__pycache__/
33
*.py[cod]
4+
target/
45

6+
# Patchable working files
57
patchable-work/

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,14 @@ All notable changes to this project will be documented in this file.
2828
- trino-cli: Add version 470 ([#999]).
2929
- trino-storage-connector: Add version 470 ([#999]).
3030
- superset: Add version `4.1.1` ([#991]).
31+
- Added Patchable patch management tool ([#1003]).
3132

3233
### Changed
3334

3435
- kafka: Bump 3.8.0 to 3.8.1 ([#995]).
3536
- Update registry references to oci ([#989]).
3637
- trino-storage-connector: Move the build out of trino/ for easier patching ([#996]).
38+
- druid 26.0.0: Migrate to patchable ([#1003]).
3739

3840
### Removed
3941

@@ -73,6 +75,7 @@ All notable changes to this project will be documented in this file.
7375
[#997]: https://github.com/stackabletech/docker-images/pull/997
7476
[#999]: https://github.com/stackabletech/docker-images/pull/999
7577
[#1000]: https://github.com/stackabletech/docker-images/pull/1000
78+
[#1003]: https://github.com/stackabletech/docker-images/pull/1003
7679

7780
## [24.11.1] - 2025-01-14
7881

0 commit comments

Comments
 (0)