From e5f9f81d48ac460cb84b9db55f6f619ef45b5cb1 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Mon, 6 Apr 2026 11:44:10 -0500 Subject: [PATCH] chore: switch CI to tag-triggered builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Match the discord bot's CI pattern — trigger on CalVer tag push instead of branch push/PR. Removes auto-CalVer generation and simplifies to a single build step. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/docker-build.yml | 86 +++++++++++-------------------- CLAUDE.md | 2 +- 2 files changed, 31 insertions(+), 57 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 712c4af..6bfb9cc 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -1,20 +1,18 @@ # Gitea Actions: Docker Build, Push, and Notify # # CI/CD pipeline for Major Domo Database API: -# - Builds Docker images on every push/PR -# - Auto-generates CalVer version (YYYY.MM.BUILD) on main branch merges -# - Pushes to Docker Hub and creates git tag on main +# - Triggered by pushing a CalVer tag (e.g., 2026.4.5) +# - Builds Docker image and pushes to Docker Hub with version + latest tags # - Sends Discord notifications on success/failure +# +# To release: git tag -a 2026.4.5 -m "description" && git push origin 2026.4.5 name: Build Docker Image on: push: - branches: - - main - pull_request: - branches: - - main + tags: + - '20*' # matches CalVer tags like 2026.4.5 jobs: build: @@ -24,7 +22,16 @@ jobs: - name: Checkout code uses: https://github.com/actions/checkout@v4 with: - fetch-depth: 0 # Full history for tag counting + fetch-depth: 0 + + - name: Extract version from tag + id: version + run: | + VERSION=${GITHUB_REF#refs/tags/} + SHA_SHORT=$(git rev-parse --short HEAD) + echo "version=$VERSION" >> $GITHUB_OUTPUT + echo "sha_short=$SHA_SHORT" >> $GITHUB_OUTPUT + echo "timestamp=$(date -u +%Y-%m-%dT%H:%M:%SZ)" >> $GITHUB_OUTPUT - name: Set up Docker Buildx uses: https://github.com/docker/setup-buildx-action@v3 @@ -35,80 +42,47 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Generate CalVer version - id: calver - uses: cal/gitea-actions/calver@main - - # Dev build: push with dev + dev-SHA tags (PR/feature branches) - - name: Build Docker image (dev) - if: github.ref != 'refs/heads/main' - uses: https://github.com/docker/build-push-action@v5 - with: - context: . - push: true - tags: | - manticorum67/major-domo-database:dev - manticorum67/major-domo-database:dev-${{ steps.calver.outputs.sha_short }} - cache-from: type=registry,ref=manticorum67/major-domo-database:buildcache - cache-to: type=registry,ref=manticorum67/major-domo-database:buildcache,mode=max - - # Production build: push with latest + CalVer tags (main only) - - name: Build Docker image (production) - if: github.ref == 'refs/heads/main' + - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v5 with: context: . push: true tags: | + manticorum67/major-domo-database:${{ steps.version.outputs.version }} manticorum67/major-domo-database:latest - manticorum67/major-domo-database:${{ steps.calver.outputs.version }} - manticorum67/major-domo-database:${{ steps.calver.outputs.version_sha }} cache-from: type=registry,ref=manticorum67/major-domo-database:buildcache cache-to: type=registry,ref=manticorum67/major-domo-database:buildcache,mode=max - - name: Tag release - if: success() && github.ref == 'refs/heads/main' - uses: cal/gitea-actions/gitea-tag@main - with: - version: ${{ steps.calver.outputs.version }} - token: ${{ github.token }} - - name: Build Summary run: | echo "## Docker Build Successful" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY + echo "**Version:** \`${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY + echo "- \`manticorum67/major-domo-database:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY echo "- \`manticorum67/major-domo-database:latest\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/major-domo-database:${{ steps.calver.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY - echo "- \`manticorum67/major-domo-database:${{ steps.calver.outputs.version_sha }}\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "**Build Details:**" >> $GITHUB_STEP_SUMMARY - echo "- Branch: \`${{ steps.calver.outputs.branch }}\`" >> $GITHUB_STEP_SUMMARY - echo "- Commit: \`${{ github.sha }}\`" >> $GITHUB_STEP_SUMMARY - echo "- Timestamp: \`${{ steps.calver.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY + echo "- Commit: \`${{ steps.version.outputs.sha_short }}\`" >> $GITHUB_STEP_SUMMARY + echo "- Timestamp: \`${{ steps.version.outputs.timestamp }}\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - if [ "${{ github.ref }}" == "refs/heads/main" ]; then - echo "Pushed to Docker Hub!" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "Pull with: \`docker pull manticorum67/major-domo-database:latest\`" >> $GITHUB_STEP_SUMMARY - else - echo "_PR build - image not pushed to Docker Hub_" >> $GITHUB_STEP_SUMMARY - fi + echo "Pull with: \`docker pull manticorum67/major-domo-database:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY - name: Discord Notification - Success - if: success() && github.ref == 'refs/heads/main' + if: success() uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} title: "Major Domo Database" status: success - version: ${{ steps.calver.outputs.version }} - image_tag: ${{ steps.calver.outputs.version_sha }} - commit_sha: ${{ steps.calver.outputs.sha_short }} - timestamp: ${{ steps.calver.outputs.timestamp }} + version: ${{ steps.version.outputs.version }} + image_tag: ${{ steps.version.outputs.version }} + commit_sha: ${{ steps.version.outputs.sha_short }} + timestamp: ${{ steps.version.outputs.timestamp }} - name: Discord Notification - Failure - if: failure() && github.ref == 'refs/heads/main' + if: failure() uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} diff --git a/CLAUDE.md b/CLAUDE.md index bd9be58..39f725a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -40,7 +40,7 @@ python migrations.py # Run migrations (SQL files in migrat - **Bot container**: `dev_sba_postgres` (PostgreSQL) + `dev_sba_db_api` (API) — check with `docker ps` - **Image**: `manticorum67/major-domo-database:dev` (Docker Hub) -- **CI/CD**: Gitea Actions on PR to `main` — builds Docker image, auto-generates CalVer version (`YYYY.MM.BUILD`) on merge +- **CI/CD**: Gitea Actions — tag-triggered Docker builds. Push a CalVer tag to release: `git tag -a 2026.4.5 -m "description" && git push origin 2026.4.5` ## Important