This commit is contained in:
2026-07-16 16:14:41 -07:00
parent ea01021c8f
commit be176f2417
3 changed files with 177 additions and 60 deletions
+56 -17
View File
@@ -272,20 +272,38 @@ jobs:
cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md" cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md"
done done
- name: Commit and push changelogs if changed - name: Commit and push changelogs (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config user.name "${{ env.GIT_USERNAME }}" git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}" git config user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then if git diff --quiet && git diff --cached --quiet; then
git add */CHANGES.md echo "[INFO] No changelog changes."
git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" --no-verify exit 0
git push
else
echo "[INFO] No changelog changes to commit."
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 push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge changelog updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
generate-build-info: generate-build-info:
needs: generate-changelogs needs: generate-changelogs
runs-on: vm-docker-build2 runs-on: vm-docker-build2
@@ -400,23 +418,44 @@ jobs:
cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json" cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json"
done done
- name: Commit and push build-info if changed - name: Commit and push build-info (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config --global user.name "${{ env.GIT_USERNAME }}"
git config --global user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}"
if git diff --quiet && 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 add */build-info.json
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
git push
git push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge build-info updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
for version in $VERSIONS; do for version in $VERSIONS; do
TAG="build-$version" TAG="build-$version"
git tag -d "$TAG" 2>/dev/null || true git tag -d "$TAG" 2>/dev/null || true
git push origin ":refs/tags/$TAG" 2>/dev/null || true
git tag "$TAG" git tag "$TAG"
git push origin "$TAG" --force git push origin "$TAG"
done done
else
echo "[INFO] No build-info changes to commit."
fi
+56 -17
View File
@@ -272,20 +272,38 @@ jobs:
cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md" cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md"
done done
- name: Commit and push changelogs if changed - name: Commit and push changelogs (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config user.name "${{ env.GIT_USERNAME }}" git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}" git config user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then if git diff --quiet && git diff --cached --quiet; then
git add */CHANGES.md echo "[INFO] No changelog changes."
git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" --no-verify exit 0
git push
else
echo "[INFO] No changelog changes to commit."
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 push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge changelog updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
generate-build-info: generate-build-info:
needs: generate-changelogs needs: generate-changelogs
runs-on: vm-docker-build2 runs-on: vm-docker-build2
@@ -400,23 +418,44 @@ jobs:
cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json" cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json"
done done
- name: Commit and push build-info if changed - name: Commit and push build-info (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config --global user.name "${{ env.GIT_USERNAME }}"
git config --global user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}"
if git diff --quiet && 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 add */build-info.json
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
git push
git push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge build-info updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
for version in $VERSIONS; do for version in $VERSIONS; do
TAG="build-$version" TAG="build-$version"
git tag -d "$TAG" 2>/dev/null || true git tag -d "$TAG" 2>/dev/null || true
git push origin ":refs/tags/$TAG" 2>/dev/null || true
git tag "$TAG" git tag "$TAG"
git push origin "$TAG" --force git push origin "$TAG"
done done
else
echo "[INFO] No build-info changes to commit."
fi
+56 -17
View File
@@ -272,20 +272,38 @@ jobs:
cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md" cp "changelogs/$version/CHANGES.md" "upload-repo/$version/CHANGES.md"
done done
- name: Commit and push changelogs if changed - name: Commit and push changelogs (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config user.name "${{ env.GIT_USERNAME }}" git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}" git config user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then if git diff --quiet && git diff --cached --quiet; then
git add */CHANGES.md echo "[INFO] No changelog changes."
git commit -m "Update changelogs on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" --no-verify exit 0
git push
else
echo "[INFO] No changelog changes to commit."
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 push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge changelog updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
generate-build-info: generate-build-info:
needs: generate-changelogs needs: generate-changelogs
runs-on: vm-docker-build2 runs-on: vm-docker-build2
@@ -400,23 +418,44 @@ jobs:
cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json" cp "buildinfo/$version/build-info.json" "upload-repo/$version/build-info.json"
done done
- name: Commit and push build-info if changed - name: Commit and push build-info (temp branch)
run: | run: |
cd upload-repo cd upload-repo
git config --global user.name "${{ env.GIT_USERNAME }}"
git config --global user.email "${{ env.GIT_EMAIL }}"
if git status --porcelain | grep .; then git config user.name "${{ env.GIT_USERNAME }}"
git config user.email "${{ env.GIT_EMAIL }}"
if git diff --quiet && 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 add */build-info.json
git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')" git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ') [skip ci]"
git push
git push origin "$TEMP_BRANCH"
git fetch origin main
git checkout main
git reset --hard origin/main
git merge --no-ff "$TEMP_BRANCH" \
-m "Merge build-info updates"
git push origin main
git push origin --delete "$TEMP_BRANCH" || true
for version in $VERSIONS; do for version in $VERSIONS; do
TAG="build-$version" TAG="build-$version"
git tag -d "$TAG" 2>/dev/null || true git tag -d "$TAG" 2>/dev/null || true
git push origin ":refs/tags/$TAG" 2>/dev/null || true
git tag "$TAG" git tag "$TAG"
git push origin "$TAG" --force git push origin "$TAG"
done done
else
echo "[INFO] No build-info changes to commit."
fi