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

Parchment in NeoDev #1231

Open
wants to merge 3 commits into
base: 1.21.x
Choose a base branch
from

Conversation

Matyrobbrt
Copy link
Member

@Matyrobbrt Matyrobbrt commented Jul 4, 2024

@Matyrobbrt Matyrobbrt added 1.21 Targeted at Minecraft 1.21 ci/build Related to continuous integration/build system labels Jul 4, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Jul 4, 2024

  • Publish PR to GitHub Packages

Last commit published: b1a9cde094956ea24fc115123d69e04bfabaedbf.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #1231' // https://github.com/neoforged/NeoForge/pull/1231
        url 'https://prmaven.neoforged.net/NeoForge/pr1231'
        content {
            includeModule('net.neoforged', 'neoforge')
            includeModule('net.neoforged', 'testframework')
        }
    }
}

MDK installation

In order to setup a MDK using the latest PR version, run the following commands in a terminal.
The script works on both *nix and Windows as long as you have the JDK bin folder on the path.
The script will clone the MDK in a folder named NeoForge-pr1231.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1231
cd NeoForge-pr1231
curl -L https://prmaven.neoforged.net/NeoForge/pr1231/net/neoforged/neoforge/21.0.91-beta-pr-1231-neodev-parchment/mdk-pr1231.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip

To test a production environment, you can download the installer from here.

@lukebemish
Copy link
Contributor

Is it possible to make the patches, as checked in to git, not be in parchment? Because otherwise it seems like you'll end up with a bunch of churn in those -- which will require rebasing PRs and whatnot -- just from updating parchment.

@Matyrobbrt
Copy link
Member Author

The patches on the repo are intentionally in Parchment, as otherwise it's very head to review PRs when you don't know what the local variables represent.

Parchment wouldn't be often updated within Neo, if at all.

@lukebemish
Copy link
Contributor

lukebemish commented Jul 4, 2024

Parchment in neodev will have to be updated to not fall behind with MC version changes, right? But yeah, fair enough, if its a rare event and not too many parameters change that's not a huge impact.

That said, I think this PR should document a series of steps to rebase other PRs to match these changes without having to do a bunch of manual stuff, because otherwise it's going to be painful to update any PR with patches.

@Matyrobbrt
Copy link
Member Author

That said, I think this PR should document a series of steps to rebase_other_ PRs to match these changes without having to do a bunch of manual stuff, because otherwise it's going to be painful to update any PR with patches.

There aren't really non-manual steps, I did it with some NG modifications and Java scripts in random projects. And besides, the amount of PRs that still have old patches will reduce itself to 0 gradually anyway, there's not that many right now.

@neoforged-automation
Copy link

@Matyrobbrt, this pull request has conflicts, please resolve them for this PR to move forward.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21 Targeted at Minecraft 1.21 ci/build Related to continuous integration/build system needs rebase
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants