pan3793 opened a new pull request, #4831: URL: https://github.com/apache/zeppelin/pull/4831
### What is this PR for? Zeppelin has `dev/merge_zeppelin_pr.py`, I would recommend committers to use this script over the GitHub button to merge PR, which has some benefits: 1. Simplify the backport process the tools will ask you to backport the commit to lower maintained branches after you merge a PR to master, if there are no conflicts, all things you need to do are just type a "branch name" that you want to backport. 2. Automatically update JIRA information the script uses the python jira client to update JIRA ticket, for example, fill in the fixed versions, which is important to users to know the features/bug fixes applied versions. 3. Better PR title, body, and committer info Zeppelin <img width="1001" alt="image" src="https://github.com/user-attachments/assets/b709f5f1-0194-4472-885a-8336db3bc9d4";> Spark <img width="992" alt="image" src="https://github.com/user-attachments/assets/c16d9469-15bd-4158-b745-c6b21df7574f";> ### What type of PR is it? Improvement ### Todos * [ ] - revert https://github.com/apache/zeppelin/pull/4452 * [ ] - verify this script by merging at least 3 PRs ### What is the Jira issue? ZEPPELIN-6089 ### How should this be tested? Manually test. ``` (zeppelin) ➜ apache-zeppelin git:(ZEPPELIN-6089) dev/merge_zeppelin_pr.py git rev-parse --abbrev-ref HEAD Which pull request would you like to merge? (e.g. 34): 4807 === JIRA ZEPPELIN-6073 === Summary Canonicalize binary distribution tarball name Assignee None Status Open Url https://issues.apache.org/jira/browse/ZEPPELIN-6073 Affected [] === Pull Request #4807 === title [ZEPPELIN-6073][BUILD] Canonicalize binary distribution tarball name source pan3793/ZEPPELIN-6073 target master url https://api.github.com/repos/apache/zeppelin/pulls/4807 Proceed with merging pull request #4807? (y/N): y git fetch apache pull/4807/head:PR_TOOL_MERGE_PR_4807 From github.com:apache/zeppelin * [new ref] refs/pull/4807/head -> PR_TOOL_MERGE_PR_4807 git fetch apache master:PR_TOOL_MERGE_PR_4807_MASTER From github.com:apache/zeppelin * [new branch] master -> PR_TOOL_MERGE_PR_4807_MASTER git checkout PR_TOOL_MERGE_PR_4807_MASTER Switched to branch 'PR_TOOL_MERGE_PR_4807_MASTER' ['git', 'merge', 'PR_TOOL_MERGE_PR_4807', '--squash'] Automatic merge went well; stopped before committing as requested ['git', 'log', 'HEAD..PR_TOOL_MERGE_PR_4807', '--pretty=format:%an <%ae>', '--reverse'] Enter primary author in the format of "name <email>" [Cheng Pan <[email protected]>]: git config --get user.name git config --get user.email ['git', 'commit', '--author="Cheng Pan <[email protected]>"', '-m', '[ZEPPELIN-6073][BUILD] Canonicalize binary distribution tarball name', '-m', '### What is this PR for?\r\n\r\nThis PR aims to canonicalize the binary distribution tarball name assembled by Maven.\r\n\r\nCurrently, the `./mvnw clean package -Pbuild-distr -DskipTests` produces `zeppelin-0.12.0-SNAPSHOT.tar.gz`, while the final release tarballs are `zeppelin-0.11.1-bin-all.tgz` and `zeppelin-0.11.1-bin-netinst.tgz`.\r\n\r\nAfter this change, `./mvnw clean package -Pbuild-distr -DskipTests` produces `zeppelin-0.12.0-SNAPSHOT-bin.tgz`.\r\n\r\n### What type of PR is it?\r\n\r\nImprovement\r\n\r\n### What is the Jira issue?\r\n\r\nZEPPELIN-6073\r\n\r\n### How should this be tested?\r\n\r\nPass existing GHA and manually run maven command to package the binary tarball.\r\n\r\n```\r\n$ ./mvnw clean package -Pbuild-distr -DskipTests\r\n```\r\n\r\n```\r\n...\r\n[INFO] -------------< org.apache.zeppelin:zeppelin-distributio n >--------------\r\n[INFO] Building Zeppelin: Packaging distribution 0.12.0-SNAPSHOT [64/64]\r\n[INFO] --------------------------------[ pom ]---------------------------------\r\n...\r\n[INFO] --- maven-assembly-plugin:3.7.1:single (make-assembly) zeppelin-distribution ---\r\n[INFO] Reading assembly descriptor: src/assemble/distribution.xml\r\n[INFO] Copying files to /Users/chengpan/Projects/apache-zeppelin/zeppelin-distribution/target/zeppelin-0.12.0-SNAPSHOT-bin\r\n[INFO] 838 files copied to /Users/chengpan/Projects/apache-zeppelin/zeppelin-distribution/target/zeppelin-0.12.0-SNAPSHOT-bin\r\n[INFO] Building tar: /Users/chengpan/Projects/apache-zeppelin/zeppelin-distribution/target/zeppelin-0.12.0-SNAPSHOT-bin.tgz\r\n...\r\n```\r\n\r\n### Screenshots (if appropriate)\r\n\r\n### Questions:\r\n* Does the license files need to update? No\r\n* Is there breaking changes for older versions? No\r\n* Does this needs documentation? No\r\n', '-m', 'Closes #4807 from pan3793/ZEPPELIN -6073.', '-m', 'Authored-by: Cheng Pan <[email protected]>\nSigned-off-by: Cheng Pan <[email protected]>'] husky > pre-commit (node v18.20.4) No staged files match any of provided globs. Merge complete (local ref PR_TOOL_MERGE_PR_4807_MASTER). Push to apache? (y/N): y git push apache PR_TOOL_MERGE_PR_4807_MASTER:master Enumerating objects: 39, done. Counting objects: 100% (39/39), done. Delta compression using up to 10 threads Compressing objects: 100% (19/19), done. Writing objects: 100% (20/20), 3.04 KiB | 3.04 MiB/s, done. Total 20 (delta 14), reused 0 (delta 0), pack-reused 0 remote: Resolving deltas: 100% (14/14), completed with 14 local objects. remote: error: GH006: Protected branch update failed for refs/heads/master. remote: remote: - Changes must be made through a pull request. To github.com:apache/zeppelin.git ! [remote rejected] PR_TOOL_MERGE_PR_4807_MASTER -> master (protected branch hook declined) error: failed to push some refs to 'github.com:apache/zeppelin.git' ... ``` ### Screenshots (if appropriate) ### Questions: * Does the license files need to update? No. * Is there breaking changes for older versions? No. * Does this needs documentation? No. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
