13
0
geforkt von Mirrors/Paper
Commit graph

17 Commits

Autor SHA1 Nachricht Datum
Aikar
9ac6f9a94f [CI-SKIP] Avoid rebuilding Paper-Server if Paper-API did not apply
This scenario occurs when Paper-API fails, we then rebuild the patches,
however Paper-Server was left un an outdated state since the most
recent patches did not get applied to it.

This results in us reverting Paper-Server to an older state.

If Paper-API fails to apply, then Paper-Server has to be considered dirty.

This should avoid us having accidental patch reversions
2018-08-12 11:54:35 -04:00
Aikar
2cb4cf8d52 [CI-SKIP] If mc-dev src folder exists, rebuild it on apply
This ensures your local copy of this folder is up to date whenever
mcdev imports change on the project.

Before, as we/upstream add/remove's imports, your local folder could
be out of sync and you have to randomly check 'do i need to run this?'

This will just automate it. For those people who don't use this
folder (not sure why you don't!), it won't change anything.
2018-08-11 13:42:15 -04:00
Aikar
be0ed31821 [CI-SKIP] Merge branch 'master' into pre/1.13
* master:
  Properly forward exit 1 code from the paper root command
2018-07-30 17:40:54 -04:00
Aikar
15735117d7 Properly forward exit 1 code from the paper root command
This is so the CI server can pick up when applying patches fails,
and mark the build as a failure.
2018-07-30 17:37:24 -04:00
Aikar
6d1a918378 NOT FINISHED!!! Current Progress on 1.13-pre7 update
This work is 100% unfinished. I am pushing it up so that we as a team
can work on this update.

Do not try to use this branch. You will fail.
2018-07-14 21:53:17 -04:00
Aikar
898b8957a8 Initial Paper-API for Bukkit 1.13 Preview 4 - THIS IS NOT SERVER
This branch/commit is only useful to those who purely use a clean Bukkit/Spigot/Paper API
and does not use NMS/OBC references.

This will let you start updating your plugin to the latest 1.13 builds of Bukkit Preview (4 as of now)

Note that this release is not final!!! API breakages may occur!

It is up to you if you find use out of this work.
2018-07-13 21:44:35 -04:00
Kyle Wood
fdc7459143 Handle gpg signing better (#1123)
Instead of checking whether it was set previously, setting it to false,
then setting it back to true if it was true before, just use the
command-line argument in git to override the config for that command.
Using a variable makes it pretty painless to do.
2018-05-24 13:41:50 -05:00
Zach Brown
cf82968f35 Apply workaround for patch application on Windows (#1122)
This is not a perfect workaround but it seems to be the best solution
for the moment.

On Windows, this means that when a patch fails to apply, you would now
need to fix that patch, finish the apply (AM), then rebuild all patches,
and then finally re-run the patch apply procedure in order to continue.

This adds a small amount of overhead compared to the traditional method
(which will still work on *nix environments, including WSL). However, it
seems preferable to the build not working on Windows at all.
2018-05-16 20:41:10 -05:00
Zach Brown
d48896cf0e Z plays with scripts and GPG part 2 2016-04-13 22:39:54 -05:00
Zach Brown
b53c80ce35 Revert "Z plays with the scripts and GPG some more"
This reverts commit e3e56baeea.
2016-04-13 22:39:54 -05:00
Zach Brown
e3e56baeea Z plays with the scripts and GPG some more 2016-04-13 22:05:59 -05:00
Zach Brown
85a924b7dd Move comment to its proper location 2016-04-07 01:39:54 -05:00
Zach Brown
d158c69570 Disable, Enable GPG signs as needed Pre, Post git am
Disable GPG signing before AM, slows things down and doesn't play nicely.
There is also zero rational or logical reason to do so for these sub-repo AMs.
It's re-enabled (if needed) immediately after, pass or fail.

Given GitHub's recent push for GPG signing, and our own testing, this is not
only helpful, but necessary.
2016-04-07 01:36:23 -05:00
DemonWav
56705f6445 Workaround for OSX not having the realpath command. 2016-04-03 03:35:51 -05:00
DemonWav
ed05173181 Use set -e to handle errors better in the build scripts 2016-04-03 02:23:19 -05:00
DemonWav
aeea23a135 Rebuild patches after we continue from a paper edit. 2016-04-02 18:34:27 -05:00
DemonWav
09812092f9 Cleanup and restructure the project 2016-04-01 22:55:54 -05:00