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

update workflows to handle parallel building
minecraft-build-vanilla / Docker prune (vm-docker-build2) (push) Successful in 6s
Details
minecraft-build-testing / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
minecraft-build-quilt / Docker prune (vm-docker-build2) (push) Successful in 5s
Details
minecraft-build-vanilla / poll-debian-base-and-detect-changes (push) Successful in 27s
Details
minecraft-build-neoforged / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
minecraft-build-forge / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
minecraft-build-testing / poll-debian-base-and-detect-changes (push) Successful in 22s
Details
minecraft-build-fabric / Docker prune (vm-docker-build2) (push) Successful in 4s
Details
minecraft-build-quilt / poll-debian-base-and-detect-changes (push) Successful in 19s
Details
minecraft-build-bukkit / Docker prune (vm-docker-build2) (push) Successful in 5s
Details
minecraft-build-vanilla / Build and Push vanilla (push) Successful in 38s
Details
minecraft-build-neoforged / poll-debian-base-and-detect-changes (push) Successful in 21s
Details
minecraft-build-forge / poll-debian-base-and-detect-changes (push) Successful in 12s
Details
minecraft-build-fabric / poll-debian-base-and-detect-changes (push) Successful in 11s
Details
minecraft-build-testing / Build and Push testing (push) Successful in 27s
Details
minecraft-build-quilt / Build and Push quilt (push) Successful in 33s
Details
minecraft-build-bukkit / poll-debian-base-and-detect-changes (push) Successful in 14s
Details
minecraft-build-vanilla / generate-changelogs (push) Successful in 8s
Details
minecraft-build-neoforged / Build and Push neoforged (push) Successful in 29s
Details
minecraft-build-forge / Build and Push forge (push) Successful in 28s
Details
minecraft-build-testing / generate-changelogs (push) Successful in 10s
Details
minecraft-build-fabric / Build and Push fabric (push) Successful in 29s
Details
minecraft-build-quilt / generate-changelogs (push) Successful in 11s
Details
minecraft-build-vanilla / generate-build-info (push) Successful in 14s
Details
minecraft-build-bukkit / Build and Push bukkit (push) Successful in 28s
Details
minecraft-build-neoforged / generate-changelogs (push) Successful in 11s
Details
minecraft-build-forge / generate-changelogs (push) Successful in 10s
Details
minecraft-build-testing / generate-build-info (push) Successful in 11s
Details
minecraft-build-fabric / generate-changelogs (push) Successful in 8s
Details
minecraft-build-quilt / generate-build-info (push) Successful in 15s
Details
minecraft-build-bukkit / generate-changelogs (push) Successful in 13s
Details
minecraft-build-neoforged / generate-build-info (push) Successful in 14s
Details
minecraft-build-forge / generate-build-info (push) Successful in 17s
Details
minecraft-build-fabric / generate-build-info (push) Successful in 18s
Details
minecraft-build-bukkit / generate-build-info (push) Successful in 30s
Details

Browse Source
This commit is contained in:
fithwum
2026-07-17 16:41:57 -07:00
parent f2a4e76a32
commit b6218b0577
7 changed files with 351 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/minecraft-build-bukkit.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-fabric.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-forge.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-neoforged.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-quilt.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-testing.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
.gitea/workflows/minecraft-build-vanilla.yml
+50 -14
View File
@@ -227,21 +227,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No changelog changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master
@@ -333,21 +351,39 @@ jobs:
git config user.name "${{ secrets.GIT_USERNAME }}" git config user.name "${{ secrets.GIT_USERNAME }}"
git config user.email "${{ secrets.GIT_EMAIL }}" 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." echo "[INFO] No build-info changes."
exit 0 exit 0
fi 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 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 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 checkout master
git reset --hard origin/master git reset --hard origin/master