Commit graph

15 commits

Author SHA1 Message Date
Aikar
cae5a06b92
[CI-SKIP] Merge branch 'master' into pre/1.13
* master:
  Properly forward exit 1 code from the paper root command
2018-07-30 17:41:05 -04:00
Aikar
d54ce6c17f
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
5b6dfb3463
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-16 00:13:29 -04:00
Aikar
a8c28e1920
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-14 21:53:22 -04:00
Kyle Wood
d45565f83b 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
01c6454ead 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
86722e02bf
Z plays with scripts and GPG part 2 2016-04-14 19:15:40 -05:00
Zach Brown
9de6a01c18 Revert "Z plays with the scripts and GPG some more"
This reverts commit 834b29c2dc.
2016-04-13 22:39:54 -05:00
Zach Brown
834b29c2dc
Z plays with the scripts and GPG some more 2016-04-13 22:20:23 -05:00
Zach Brown
baa0270275
Move comment to its proper location 2016-04-07 01:39:54 -05:00
Zach Brown
348e6968c3
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
4108dc5b68 Workaround for OSX not having the realpath command. 2016-04-03 03:53:58 -05:00
DemonWav
0394633734 Use set -e to handle errors better in the build scripts 2016-04-03 03:43:30 -05:00
DemonWav
7effde04b1 Rebuild patches after we continue from a paper edit. 2016-04-03 01:39:31 -05:00
DemonWav
8b66d99e73 Cleanup and restructure the project 2016-04-01 23:15:41 -05:00
Renamed from applyPatches.sh (Browse further)