fithwum/minecraft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates
minecraft-build-bukkit / Docker prune (vm-docker-build2) (push) Successful in 5s
Details
minecraft-build-fabric / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
minecraft-build-quilt / Docker prune (vm-docker-build2) (push) Successful in 3s
Details
minecraft-build-vanilla / Docker prune (vm-docker-build2) (push) Successful in 3s
Details
minecraft-build-bukkit / poll-debian-base-and-detect-changes (push) Successful in 28s
Details
minecraft-build-fabric / poll-debian-base-and-detect-changes (push) Successful in 25s
Details
minecraft-build-quilt / poll-debian-base-and-detect-changes (push) Successful in 13s
Details
minecraft-build-vanilla / poll-debian-base-and-detect-changes (push) Successful in 14s
Details
minecraft-build-bukkit / Build and Push bukkit (push) Successful in 19s
Details
minecraft-build-fabric / Build and Push fabric (push) Successful in 12s
Details
minecraft-build-quilt / Build and Push quilt (push) Successful in 12s
Details
minecraft-build-bukkit / generate-changelogs (push) Successful in 13s
Details
minecraft-build-vanilla / Build and Push vanilla (push) Successful in 30s
Details
minecraft-build-fabric / generate-changelogs (push) Successful in 10s
Details
minecraft-build-quilt / generate-changelogs (push) Successful in 11s
Details
minecraft-build-bukkit / generate-build-info (push) Successful in 16s
Details
minecraft-build-vanilla / generate-changelogs (push) Successful in 11s
Details
minecraft-build-quilt / generate-build-info (push) Successful in 17s
Details
minecraft-build-fabric / generate-build-info (push) Successful in 19s
Details
minecraft-build-vanilla / generate-build-info (push) Successful in 16s
Details
minecraft-build-minecraft / Docker prune (vm-docker-build2) (push) Successful in 3s
Details
minecraft-build-minecraft / poll-debian-base-and-detect-changes (push) Successful in 14s
Details
minecraft-build-minecraft / Build and Push minecraft (push) Successful in 28s
Details
minecraft-build-minecraft / generate-changelogs (push) Successful in 11s
Details
minecraft-build-minecraft / generate-build-info (push) Successful in 17s
Details

Browse Source
This commit is contained in:
fithwum
2026-07-17 16:21:34 -07:00
parent c4e27ab8e7
commit e2ff4044db
5 changed files with 65 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/minecraft-build-minecraft.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}"
if git diff --quiet && git diff --cached --quiet; then
TEMP_BRANCH="tmp-changelog-$(date +%s)"
# Create temporary branch
git checkout -b "$TEMP_BRANCH"
# Stage changes
git add */CHANGES.md
# Nothing changed?
if git diff --cached --quiet; then
echo "[INFO] No changelog changes."
exit 0
fi
TEMP_BRANCH="tmp-changelog-$(date +%s)"
git checkout -b "$TEMP_BRANCH"
git add */CHANGES.md
git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
git push origin "$TEMP_BRANCH"
# Push temporary branch
git push origin HEAD:$TEMP_BRANCH
# Rebase temp branch onto latest master
git fetch origin master
git checkout "$TEMP_BRANCH"
if ! git rebase origin/master; then
echo "[WARN] Rebase failed, using merge instead."
git rebase --abort || true
git merge origin/master --no-edit
fi
git push origin HEAD:$TEMP_BRANCH --force
# Fast-forward master
git checkout master
git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}"
if git diff --quiet && git diff --cached --quiet; then
TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
# Create temporary branch
git checkout -b "$TEMP_BRANCH"
# Stage changes
git add */build-info.json
# Nothing changed?
if git diff --cached --quiet; then
echo "[INFO] No build-info changes."
exit 0
fi
TEMP_BRANCH="tmp-buildinfo-$(date +%s)"
git checkout -b "$TEMP_BRANCH"
git add */build-info.json
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
git push origin "$TEMP_BRANCH"
# Push temporary branch
git push origin HEAD:$TEMP_BRANCH
# Rebase temp branch onto latest master
git fetch origin master
git checkout "$TEMP_BRANCH"
if ! git rebase origin/master; then
echo "[WARN] Rebase failed, using merge instead."
git rebase --abort || true
git merge origin/master --no-edit
fi
git push origin HEAD:$TEMP_BRANCH --force
# Merge into master
git checkout master
git reset --hard origin/master
bukkit/install_script.sh
+4 -4
View File
@@ -41,7 +41,7 @@ fi
# Main install (Debian).
# Check for server files and download if needed.
if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
then
echo " "
echo "INFO ! craftbukkit-$MC_VERSION.jar found starting now."
@@ -55,9 +55,9 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
wget --no-cache --show-progress --progress=bar:force:noscroll $INSTALLER_FILE -O $MC_DIR/craftbukkit-$MC_VERSION.jar
chmod +x $MC_DIR/craftbukkit-$MC_VERSION.jar
echo " "
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
#!/bin/bash
# Copyright (c) 2022 fithwum
# All rights reserved
@@ -72,7 +72,7 @@ if [ -e $MC_DIR/craftbukkit-$MC_VERSION.jar ]
fi
done
EOF
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
chmod +x $MC_DIR/run-$MC_VERSION.sh
fi
echo "INFO ! Setting game port."
fabric/install_script.sh
+4 -4
View File
@@ -41,7 +41,7 @@ fi
# Main install (Debian).
# Check for server files and download if needed.
if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
then
echo " "
echo "INFO ! fabric-$MC_VERSION-$FABRIC_VERSION.jar found starting now."
@@ -55,9 +55,9 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
wget --no-cache --show-progress --progress=bar:force:noscroll $SERVER_FILE -O $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
chmod +x $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar
echo " "
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
#!/bin/bash
# Copyright (c) 2022 fithwum
# All rights reserved
@@ -72,7 +72,7 @@ if [ -e $MC_DIR/fabric-$MC_VERSION-$FABRIC_VERSION.jar ]
fi
done
EOF
chmod +x $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh
chmod +x $MC_DIR/run-$MC_VERSION.sh
fi
echo "INFO ! Setting game port."
quilt/Install_Script.sh
+3 -3
View File
@@ -41,7 +41,7 @@ fi
# Main install (Debian).
# Check for server files and download if needed.
if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
then
echo " "
echo "INFO ! quilt-installer-$QUILT_VERSION.jar found starting now."
@@ -63,9 +63,9 @@ if [ -e $MC_DIR/quilt-installer-$QUILT_VERSION.jar ]
cd ..
rm -fr server
echo " "
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
mv -v run-*.sh old-server-versions/
cat > run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
cat > run-$MC_VERSION.sh <<- "EOF"
#!/bin/bash
# Copyright (c) 2022 fithwum
# All rights reserved
vanilla/install_script.sh
+3 -3
View File
@@ -41,7 +41,7 @@ fi
# Main install (Debian).
# Check for server files and download if needed.
if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ] && [ -e "$MC_DIR/run-$MC_VERSION.sh" ]
then
echo " "
echo "INFO ! mcserver-$MC_VERSION.jar found starting now."
@@ -55,9 +55,9 @@ if [ -e $MC_DIR/mcserver-$MC_VERSION.jar ]
wget --no-cache --show-progress --progress=bar:force:noscroll $MC_SERVER_FILE -O $MC_DIR/mcserver-$MC_VERSION.jar
chmod +x $MC_DIR/mcserver-$MC_VERSION.jar
echo " "
echo "WARNING ! run-$MC_TYPE-$MC_VERSION.sh is out of date/missing ... will generate now."
echo "WARNING ! run-$MC_VERSION.sh is out of date/missing ... will generate now."
mv -v $MC_DIR/run-*.sh $MC_DIR/old-server-versions/
cat > $MC_DIR/run-$MC_TYPE-$MC_VERSION.sh <<- "EOF"
cat > $MC_DIR/run-$MC_VERSION.sh <<- "EOF"
#!/bin/bash
# Copyright (c) 2022 fithwum
# All rights reserved