Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ci-skip] Fix import mc-dev task

Browse Source
This commit is contained in:
jmp
2020-12-19 01:10:22 -08:00
parent 64f5f9d776
commit a541703091
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/kotlin/task/ApplyPatches.kt
View File

@@ -22,6 +22,7 @@ internal fun Project.createApplyPatchesTask(
// Reset or initialize subproject
logger.lifecycle(">>> Resetting subproject $name")
if (projectDir.exists()) {
ensureSuccess(gitCmd("fetch", "origin", dir = projectDir))
ensureSuccess(gitCmd("reset", "--hard", "origin/master", dir = projectDir))
} else {
ensureSuccess(gitCmd("clone", sourceRepo.absolutePath, projectDir.absolutePath))

2
buildSrc/src/main/kotlin/task/ImportMCDev.kt
View File

@@ -48,7 +48,7 @@ internal fun Project.createImportMCDevTask(
if (lastCommitIsMCDev) {
ensureSuccess(
gitCmd(
"reset", "--hard", "origin/master",
"reset", "--hard", "HEAD~1",
dir = upstreamServer,
printOut = true
)