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

[ci-skip] stop needing to specify --paper in upstreamCommit

Browse Source
This commit is contained in:
granny
2023-04-14 00:27:04 -07:00
parent 9429820ef6
commit 96dbac365c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/upstreamCommit.sh
View File

@@ -3,7 +3,7 @@
# requires curl & jq # requires curl & jq
# upstreamCommit --paper HASH --pufferfish HASH # upstreamCommit --paper HASH --pufferfish HASH
# flag: --paper HASH - the commit hash to use for comparing commits between paper (PaperMC/Paper/compare/HASH...HEAD) # flag: --paper HASH - (Optional) the commit hash to use for comparing commits between paper (PaperMC/Paper/compare/HASH...HEAD)
# flag: --pufferfish HASH - the commit hash to use for comparing commits between pufferfish (pufferfish-gg/Pufferfish/compare/HASH...HEAD) # flag: --pufferfish HASH - the commit hash to use for comparing commits between pufferfish (pufferfish-gg/Pufferfish/compare/HASH...HEAD)
function getCommits() { function getCommits() {
@@ -14,7 +14,7 @@ function getCommits() {
set -e set -e
PS1="$" PS1="$"
paperHash="" paperHash=$(git diff gradle.properties | awk '/^-paperCommit =/{print $NF}')
pufferfishHash="" pufferfishHash=""
TEMP=$(getopt --long paper:,pufferfish: -o "" -- "$@") TEMP=$(getopt --long paper:,pufferfish: -o "" -- "$@")
@@ -70,6 +70,8 @@ fi
disclaimer="Upstream has released updates that appear to apply and compile correctly" disclaimer="Upstream has released updates that appear to apply and compile correctly"
log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}" log="Updated Upstream ($updated)\n\n${disclaimer}${logsuffix}"
git add gradle.properties
echo -e "$log" | git commit -F - echo -e "$log" | git commit -F -
) || exit 1 ) || exit 1