core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[CI-SKIP] Ignore gitignore when adding files in automation 

Continuation of #5387

Fixes #5456
This commit is contained in:
Professor Bloodstone 2021-04-05 13:14:54 +02:00 committed by Kyle Wood
parent d8e384a164
commit 304a216ba5
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/apatch.sh
View File

@ -52,7 +52,7 @@ fi
if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
export summaryfail="$summaryfail\nFAILED TO APPLY: $i" export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
else else
$gitcmd add "$i" $gitcmd add --force "$i"
export summarygood="$summarygood\nAPPLIED CLEAN: $i" export summarygood="$summarygood\nAPPLIED CLEAN: $i"
fi fi
done done

2
scripts/importmcdev.sh
View File

@ -121,6 +121,6 @@ importLibrary com.mojang datafixerupper com/mojang/serialization Dynamic.java
set -e set -e
cd "$workdir/Spigot/Spigot-Server/" cd "$workdir/Spigot/Spigot-Server/"
rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1 rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1
$gitcmd add . --force -A >/dev/null 2>&1 $gitcmd add --force . -A >/dev/null 2>&1
echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F - echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F -
) )

4
scripts/init.sh
View File

@ -54,7 +54,7 @@ do
mkdir -p "$(dirname $cb/"$file")" mkdir -p "$(dirname $cb/"$file")"
cp "$nms/$file" "$cb/$file" cp "$nms/$file" "$cb/$file"
done < <(find nms-patches -type f -print0) done < <(find nms-patches -type f -print0)
$gitcmd add src $gitcmd add --force src
$gitcmd commit -m "Minecraft $ $(date)" --author="Vanilla <auto@mated.null>" $gitcmd commit -m "Minecraft $ $(date)" --author="Vanilla <auto@mated.null>"
# apply patches # apply patches
@ -71,7 +71,7 @@ do
"$patch" -d src/main/java -p 1 < "$patchFile" "$patch" -d src/main/java -p 1 < "$patchFile"
done < <(find nms-patches -type f -print0) done < <(find nms-patches -type f -print0)
$gitcmd add src $gitcmd add --force src
$gitcmd commit -m "CraftBukkit $ $(date)" --author="CraftBukkit <auto@mated.null>" $gitcmd commit -m "CraftBukkit $ $(date)" --author="CraftBukkit <auto@mated.null>"
$gitcmd checkout -f HEAD~2 $gitcmd checkout -f HEAD~2
) )

2
scripts/rebuildPatches.sh
View File

@ -52,7 +52,7 @@ function savePatches {
$gitcmd format-patch --zero-commit --full-index --no-signature --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null $gitcmd format-patch --zero-commit --full-index --no-signature --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null
cd "$basedir" cd "$basedir"
$gitcmd add -A "$basedir/${what_name}-Patches" $gitcmd add --force -A "$basedir/${what_name}-Patches"
if [ "$nofilter" == "0" ]; then if [ "$nofilter" == "0" ]; then
cleanupPatches "$basedir/${what_name}-Patches" cleanupPatches "$basedir/${what_name}-Patches"
fi fi

2
scripts/upstreamMerge.sh
View File

@ -16,7 +16,7 @@ function update {
$gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master
refRemote=$(git rev-parse HEAD) refRemote=$(git rev-parse HEAD)
cd ../ cd ../
$gitcmd add $1 -f $gitcmd add --force $1
refHEAD=$(getRef HEAD "$workdir/$1") refHEAD=$(getRef HEAD "$workdir/$1")
echo "$1 $refHEAD - $refRemote" echo "$1 $refHEAD - $refRemote"
if [ "$refHEAD" != "$refRemote" ]; then if [ "$refHEAD" != "$refRemote" ]; then