From 1b64f77f5f731bf6bb3b8a6dffbe6f0a86431e73 Mon Sep 17 00:00:00 2001 From: Cal Corum Date: Thu, 26 Mar 2026 12:28:39 -0500 Subject: [PATCH] ci: update workflow to trigger on CalVer tag push Cherry-pick current docker-build workflow from main so CalVer tags on this hotfix branch trigger CI builds correctly. Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitea/workflows/docker-build.yml | 94 ++++++++++++++++--------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 9fae8dc..773d7d4 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -1,31 +1,48 @@ # Gitea Actions: Docker Build, Push, and Notify # # CI/CD pipeline for Paper Dynasty Discord Bot: -# - 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.3.11) or "dev" tag +# - CalVer tags push with version + "production" Docker tags +# - "dev" tag pushes with "dev" Docker tag for the dev environment # - Sends Discord notifications on success/failure +# +# To release: git tag 2026.3.11 && git push origin 2026.3.11 +# To deploy dev: git tag -f dev && git push origin dev --force name: Build Docker Image on: push: - branches: - - main - - next-release - pull_request: - branches: - - main + tags: + - '20*' # matches CalVer tags like 2026.3.11 + - 'dev' # dev environment builds jobs: build: runs-on: ubuntu-latest + container: + volumes: + - pd-buildx-cache:/opt/buildx-cache steps: - 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 + if [ "$VERSION" = "dev" ]; then + echo "environment=dev" >> $GITHUB_OUTPUT + else + echo "environment=production" >> $GITHUB_OUTPUT + fi - name: Set up Docker Buildx uses: https://github.com/docker/setup-buildx-action@v3 @@ -36,67 +53,52 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Generate CalVer version - id: calver - uses: cal/gitea-actions/calver@main - - - name: Resolve Docker tags - id: tags - uses: cal/gitea-actions/docker-tags@main - with: - image: manticorum67/paper-dynasty-discordapp - version: ${{ steps.calver.outputs.version }} - sha_short: ${{ steps.calver.outputs.sha_short }} - - name: Build and push Docker image uses: https://github.com/docker/build-push-action@v5 with: context: . push: true - tags: ${{ steps.tags.outputs.tags }} - cache-from: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache - cache-to: type=registry,ref=manticorum67/paper-dynasty-discordapp:buildcache,mode=max + tags: | + manticorum67/paper-dynasty-discordapp:${{ steps.version.outputs.version }} + manticorum67/paper-dynasty-discordapp:${{ steps.version.outputs.environment }} + cache-from: type=local,src=/opt/buildx-cache/pd-discord + cache-to: type=local,dest=/opt/buildx-cache/pd-discord-new,mode=max - - name: Tag release - if: success() && steps.tags.outputs.channel == 'stable' - uses: cal/gitea-actions/gitea-tag@main - with: - version: ${{ steps.calver.outputs.version }} - token: ${{ github.token }} + - name: Rotate cache + run: | + rm -rf /opt/buildx-cache/pd-discord + mv /opt/buildx-cache/pd-discord-new /opt/buildx-cache/pd-discord - name: Build Summary run: | echo "## Docker Build Successful" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - echo "**Channel:** \`${{ steps.tags.outputs.channel }}\`" >> $GITHUB_STEP_SUMMARY + echo "**Version:** \`${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo "**Image Tags:**" >> $GITHUB_STEP_SUMMARY - IFS=',' read -ra TAG_ARRAY <<< "${{ steps.tags.outputs.tags }}" - for tag in "${TAG_ARRAY[@]}"; do - echo "- \`${tag}\`" >> $GITHUB_STEP_SUMMARY - done + echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY + echo "- \`manticorum67/paper-dynasty-discordapp:${{ steps.version.outputs.environment }}\`" >> $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 - echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:${{ steps.tags.outputs.primary_tag }}\`" >> $GITHUB_STEP_SUMMARY + echo "Pull with: \`docker pull manticorum67/paper-dynasty-discordapp:${{ steps.version.outputs.version }}\`" >> $GITHUB_STEP_SUMMARY - name: Discord Notification - Success - if: success() && steps.tags.outputs.channel != 'dev' + if: success() uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }} title: "Paper Dynasty Bot" 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() && steps.tags.outputs.channel != 'dev' + if: failure() uses: cal/gitea-actions/discord-notify@main with: webhook_url: ${{ secrets.DISCORD_WEBHOOK }}