Merge pull request 'chore(sync): cascade main -> dev' (#757) from main into dev

.mokogitea/workflows/custom/deploy-mokogitea.yml

@@ -39,10 +39,17 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      # NOTE: removed a "Verify dev environment is healthy" gate that curled
+      - name: Verify dev environment is healthy
-      # git.dev and `exit 1` on failure — gating a PROD deploy on a live DEV
+        run: |
-      # health check is a cross-tier false-negative (a transient dev blip blocked
+          echo "Checking git.dev.mokoconsulting.tech health..."
-      # prod). Pre-prod validation is the dev -> rc -> main pipeline + RC env.
+          if curl -sf --max-time 10 https://git.dev.mokoconsulting.tech/api/healthz; then
+            echo " Dev environment is healthy — proceeding with production deploy"
+          else
+            echo "::error::Dev environment is NOT healthy — blocking production deploy"
+            echo "Deploy to dev first (push to dev branch) and verify it passes before merging to main."
+            exit 1
+          fi
+
       - name: Checkout source (for version detection)
         uses: actions/checkout@v4
         with:
@@ -59,19 +66,17 @@ jobs:
             ENV="${{ github.event.inputs.environment }}"
           fi
           if [ "$ENV" = "production" ]; then
-            echo "compose_dir=/opt/gitea-dev" >> $GITHUB_OUTPUT
+            echo "compose_dir=/opt/gitea" >> $GITHUB_OUTPUT
             echo "container=mokogitea" >> $GITHUB_OUTPUT
             echo "source_dir=/opt/gitea/source" >> $GITHUB_OUTPUT
             echo "branch=main" >> $GITHUB_OUTPUT
             echo "tag=$VERSION" >> $GITHUB_OUTPUT
-            echo "tag_env=MOKOGITEA_TAG" >> $GITHUB_OUTPUT
           else
             echo "compose_dir=/opt/gitea-dev" >> $GITHUB_OUTPUT
             echo "container=mokogitea-dev" >> $GITHUB_OUTPUT
             echo "source_dir=/opt/gitea-dev/source" >> $GITHUB_OUTPUT
             echo "branch=dev" >> $GITHUB_OUTPUT
             echo "tag=$VERSION-dev" >> $GITHUB_OUTPUT
-            echo "tag_env=MOKOGITEA_DEV_TAG" >> $GITHUB_OUTPUT
           fi
 
       - name: Write deploy key
@@ -90,7 +95,6 @@ jobs:
           SOURCE_DIR: ${{ steps.config.outputs.source_dir }}
           COMPOSE_DIR: ${{ steps.config.outputs.compose_dir }}
           CONTAINER: ${{ steps.config.outputs.container }}
-          TAG_ENV: ${{ steps.config.outputs.tag_env }}
         run: |
           HEALTH_FMT='${{ '{{' }}.State.Health.Status${{ '}}' }}'
           IMAGE_FMT='Image: ${{ '{{' }}.Config.Image${{ '}}' }}'
@@ -130,12 +134,8 @@ jobs:
 
           echo 'Restarting container...'
           cd $COMPOSE_DIR
-          # Drive ONLY the target service's tag via its compose env-var (no sed —
+          sed -i 's|${{ env.IMAGE }}:[^ ]*|${{ env.IMAGE }}:$TAG|' docker-compose.yml
-          # a blanket 'sed s|mokogitea:...|' clobbered the dev + rc service tags too).
+          docker compose up -d $CONTAINER
-          # Remove any lingering fixed-name container first (avoids the "name already
-          # in use" conflict), then force-recreate under the shared compose project.
-          docker rm -f $CONTAINER 2>/dev/null || true
-          env $TAG_ENV="$TAG" docker compose -p gitea-dev up -d --force-recreate $CONTAINER
 
           echo 'Health check...'
           for i in 1 2 3 4 5 6 7 8; do

.mokogitea/workflows/pre-release.yml

@@ -7,7 +7,7 @@
 # INGROUP: mokocli.Release
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
 # PATH: /.mokogitea/workflows/pre-release.yml
-# VERSION: 05.02.01
+# VERSION: 05.02.00
 # BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
@@ -162,13 +162,7 @@ jobs:
           git add -A
           git diff --cached --quiet || {
             git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
-            # Push the bump commit, but do NOT fail the release if the target branch
+            git push origin HEAD 2>&1
-            # is protected and the release identity is not on the push allowlist.
-            # The build proceeds from the in-tree bumped version regardless; if the
-            # push is rejected, the next run simply re-bumps from the same base.
-            if ! git push origin HEAD 2>&1; then
-              echo "::warning::Version-bump commit could not be pushed (protected branch?). Building from in-tree version ${VERSION} anyway."
-            fi
           }
 
           # Auto-detect element via manifest_element.php