Skip to content

Fix upstreaming process and bump version to stable channel - #18

Open
byPixelTV wants to merge 10 commits into
PurpurMC:ver/26.2from
byPixelTV:ver/26.2
Open

Fix upstreaming process and bump version to stable channel#18
byPixelTV wants to merge 10 commits into
PurpurMC:ver/26.2from
byPixelTV:ver/26.2

Conversation

@byPixelTV

@byPixelTV byPixelTV commented Aug 1, 2026

Copy link
Copy Markdown

This pull request fixes the automatic upstreaming process and also bumps the minecraft version to latest 26.2 + bumps the release channel to stable. it also makes testing the upstream action easier as this pr introduces the possibility to trigger it manually.

Note: I can't really tell if the scheduled runs work, because they don't get executed or are extremly delayed in my fork for some reason, even though I allowed it. I think there are no differences between running it manually and it getting ran through a schedule, but I am not quite sure about that. I am also sorry that the commits I made at the beginning are such a mess, but my git was tweaking a bit and did not use the right user and email address, but this should not be a problem when merging this.

Edit: Scheduled actions also work, as you can see here

@kacimiamine

Copy link
Copy Markdown

Why the changes on the workflows if they are already working as intended?

@byPixelTV

Copy link
Copy Markdown
Author

They did not work correctly for me. I fixed the issue when upstreaming to latest Purpur and the actions still failed for multiple reasons. And the option to trigger the upstream workflow manually is now just there because I think when something breaks it is easier to test like that, but I can remove it again if this is a huge problem

@kacimiamine

Copy link
Copy Markdown

The reason it fails is because most of the time if not always the build.gradle.kts patches fail to apply. This is something happening since 1.21.x or something.
The reason your action worked (the link you sent) is because the upstream is already up-to-date not because you changed the actions.
For the workflow dispatch to manually start the action is unnecessary here because the goal of Tentacles is to automatically update upstream and build without relying on the user.

byPixelTV and others added 2 commits August 1, 2026 11:26
Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@5a85de0 Updated Upstream (Paper)
@byPixelTV

Copy link
Copy Markdown
Author

It is not working without the added write permission as you can see here (failed run, without perms) and here (successful run, with perms)

@kacimiamine

Copy link
Copy Markdown

That's because your fork doesn't have write permissions. It's not Tentacles's issue here. Your fork's workflows permissions are set to read only instead of read and write (You can change that in Settings -> Actions -> General -> Workflow permissions)

@kacimiamine

Copy link
Copy Markdown

Another comment, here you should only update the gradle.properties, and Tentacles should update the patches automatically

…as you can configure it in the repo settings
@byPixelTV

Copy link
Copy Markdown
Author

If you only update the gradle.properties in the original Tentacles repo it just fails. Here is the error, I have executed the commands from the upstream script to make it as realistic as possible https://pastes.dev/tCZLApZlIm

@kacimiamine

Copy link
Copy Markdown

The reason it fails is because most of the time if not always the build.gradle.kts patches fail to apply. This is something happening since 1.21.x or something.

As I was saying, this is one of the reasons why Tentacles doesn't update correctly (Patches fails easily after the paper hardfork iirc) and so if you fix them now, they will fail again.

I suggest you just the update the gradle.properties (and remove your changes on the workflows). The failing patches is another issue you don't need to do here (Since anyone using this template will fix the failed patches manually anyway)

@kacimiamine

Copy link
Copy Markdown

At this point I can say the patches can stay, and you did everything correct. Yeah you can just remove the workflow changes and I leave it to granny for any additional comment about the patches

@byPixelTV

Copy link
Copy Markdown
Author

The problem is after I removed all my changes from the workflows it just fails again, because there are no git credentials set. This is why I've added them in the first place. https://github.com/byPixelTV/Tentacles/actions/runs/30696436418/job/91360035011. It could be due to my fork not being setup correctly though, but idk

@byPixelTV
byPixelTV force-pushed the ver/26.2 branch 2 times, most recently from 003ba9a to c770892 Compare August 1, 2026 14:55
@byPixelTV

byPixelTV commented Aug 1, 2026

Copy link
Copy Markdown
Author

I now reverted back to where I've set the git credentials also in the build workflow and in all workflows with the --global flag added. I do think this is one of the issues why the actions failed to complete in the past, apart from the patches not applying correctly. If there is someone who has a better solution or thinks that this is wrong, just let me know and I will fix it

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.

2 participants