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

enhance(main/plutolang): rename to libpluto, use php scripts to build #21269

Merged
merged 1 commit into from
Sep 17, 2024

Conversation

mbekkomo
Copy link
Contributor

Closes #21255

Copy link
Member

@TomJo2000 TomJo2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple questions and a bit of housekeeping, but looks mostly fine.

packages/libpluto/build.sh Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Show resolved Hide resolved
packages/libpluto/scripts-common.php.patch Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
@TomJo2000
Copy link
Member

TomJo2000 commented Aug 26, 2024

Also goes without saying, please squash your commits.
Doesn't have to be an immediate thing, but do it before merge.

git rebase -i HEAD~7 you know the drill.

@mbekkomo mbekkomo force-pushed the plutolang-patch branch 9 times, most recently from beb9840 to 1d8dc42 Compare August 27, 2024 14:06
packages/hugo/build.sh Outdated Show resolved Hide resolved
@mbekkomo mbekkomo force-pushed the plutolang-patch branch 3 times, most recently from 428c2b1 to 523da07 Compare August 27, 2024 14:32
@TomJo2000
Copy link
Member

If you want to rebase your feature branch locally I recommend the following.

First of, in your local fork repo, add the upstream repo as a remote.
git remote add upstream https://github.com/termux/termux-packages.git

  • Stash, commit, or make a diff of the pending changes on your feature branch so its "clean".
    • git stash or git diff > branchname.diff should do the trick
  • git switch master
    Fast-forward the master branch to upstream's state.
  • git fetch --all -v; git rebase upstream/master
    • optionally git push to update the state of your fork as well.
  • git switch <feature branch>
  • git rebase master to rebase it on top of the updated master
    • if you have stashed changes or a diff, apply them (git stash pop, git apply branchname.diff)
  • git push --force-with-lease=branchname

Your feature branch is now up to date.

@mbekkomo mbekkomo force-pushed the plutolang-patch branch 6 times, most recently from fa4b4d7 to d714faf Compare August 27, 2024 15:06
@mbekkomo mbekkomo marked this pull request as ready for review August 27, 2024 15:10
Copy link
Member

@TomJo2000 TomJo2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couple minor nits, but I don't see any substantive blockers.

packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
packages/libpluto/build.sh Outdated Show resolved Hide resolved
@mbekkomo mbekkomo force-pushed the plutolang-patch branch 2 times, most recently from bdcfdb4 to 114e0f1 Compare August 28, 2024 11:30
@mbekkomo mbekkomo force-pushed the plutolang-patch branch 4 times, most recently from 498c7be to f20719d Compare August 29, 2024 14:04
packages/libpluto/build.sh Outdated Show resolved Hide resolved
@mbekkomo mbekkomo force-pushed the plutolang-patch branch 2 times, most recently from 272c48a to 75b83aa Compare September 3, 2024 21:10
Copy link
Member

@TomJo2000 TomJo2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do remember to replace the commit message with something more appropriate.

Other than that, LGTM.

@truboxl truboxl merged commit 106338f into termux:master Sep 17, 2024
7 checks passed
nguynkhn pushed a commit to nguynkhn/termux-packages that referenced this pull request Oct 16, 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.

plutolang: transfer as sub-package and prefer php scripts
3 participants