Merge branch 'dev'
This commit is contained in:
@@ -423,6 +423,9 @@ jobs:
|
||||
git push github origin/main:refs/heads/main --force 2>/dev/null \
|
||||
&& echo "main branch pushed to GitHub mirror" \
|
||||
|| echo "WARNING: GitHub mirror push failed"
|
||||
git push github origin/main:refs/heads/version --force 2>/dev/null \
|
||||
&& echo "version branch pushed to GitHub mirror" \
|
||||
|| echo "WARNING: GitHub mirror version push failed"
|
||||
|
||||
# -- Clean up lesser pre-releases (cascade) ---------------------------------
|
||||
# stable → deletes all | rc → beta,alpha,dev | beta → alpha,dev | alpha → dev
|
||||
@@ -456,6 +459,26 @@ jobs:
|
||||
|
||||
echo "Dev branch reset from main (keeps dev ahead after release)" >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
- name: "Step 12: Update version branch from main"
|
||||
if: steps.version.outputs.skip != 'true'
|
||||
continue-on-error: true
|
||||
run: |
|
||||
API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
|
||||
TOKEN="${{ secrets.GA_TOKEN }}"
|
||||
MAIN_SHA=$(git rev-parse HEAD)
|
||||
|
||||
# Try delete + recreate (handles protected branch edge cases)
|
||||
curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \
|
||||
"${API_BASE}/branches/version" 2>/dev/null && echo "Deleted old version branch"
|
||||
|
||||
curl -sf -X POST -H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
"${API_BASE}/branches" \
|
||||
-d '{"new_branch_name":"version","old_branch_name":"main"}' 2>/dev/null \
|
||||
&& echo "Created version branch from main (${MAIN_SHA})" \
|
||||
|| echo "WARNING: version branch update failed"
|
||||
|
||||
echo "Version branch updated to main (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY
|
||||
|
||||
# -- Dolibarr post-release: Reset dev version -----------------------------
|
||||
- name: "Post-release: Reset dev version"
|
||||
|
||||
Reference in New Issue
Block a user