feat: improve pipeline architecture with proper dependencies

- Deploy-dev now depends on build completion (no race conditions)
- Remove duplicate build logic from deploy-dev workflow
- Use commit-specific image tags for reliable deployments
- Deploy workflows now wait for build to complete before deploying
- Consistent image tagging across all environments (branch-commit)
- Eliminates race conditions between build and deploy

Pipeline flow: push → build → deploy → test → promote
This commit is contained in:
Greg
2025-07-01 16:16:19 -07:00
parent 49be44109c
commit bb61109330
3 changed files with 20 additions and 37 deletions

View File

@@ -1,15 +1,16 @@
name: Deploy to Development name: Deploy to Development
on: on:
push: workflow_run:
branches: [ main, master, develop ] workflows: ["Build and Push Container Image"]
paths: types:
- 'src/**' - completed
- 'Dockerfile' branches: [ develop ]
- 'nginx.conf'
- 'package.json'
- 'manifests/dev/**'
workflow_dispatch: workflow_dispatch:
inputs:
image_tag:
description: 'Image tag to deploy (default: latest build)'
required: false
env: env:
REGISTRY: ghcr.io REGISTRY: ghcr.io
@@ -19,41 +20,23 @@ jobs:
deploy-dev: deploy-dev:
runs-on: ubuntu-latest runs-on: ubuntu-latest
environment: development environment: development
if: ${{ github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch' }}
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Log in to Container Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GH_TOKEN }}
- name: Extract metadata
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=ref,event=branch
type=ref,event=pr
type=sha,prefix={{branch}}-
- name: Build and push Docker image
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
- name: Set image tag for deployment - name: Set image tag for deployment
run: | run: |
IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n1 | cut -d':' -f2) if [ "${{ github.event_name }}" = "workflow_dispatch" ] && [ -n "${{ github.event.inputs.image_tag }}" ]; then
IMAGE_TAG="${{ github.event.inputs.image_tag }}"
else
# Use the commit-based tag that was just built
IMAGE_TAG="develop-$(echo "${{ github.sha }}" | cut -c1-7)"
fi
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
echo "🏷️ Using image tag: $IMAGE_TAG" echo "🏷️ Using image tag: $IMAGE_TAG"
echo "📦 Full image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$IMAGE_TAG"
- name: Deploy to development via webhook - name: Deploy to development via webhook
run: | run: |

View File

@@ -41,7 +41,7 @@ jobs:
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
IMAGE_TAG="${{ github.event.inputs.image_tag || 'latest' }}" IMAGE_TAG="${{ github.event.inputs.image_tag || 'latest' }}"
else else
# For auto-promotion, use the latest successful build # For production deployment, use the main branch commit tag
IMAGE_TAG="main-$(echo "${{ github.sha }}" | cut -c1-7)" IMAGE_TAG="main-$(echo "${{ github.sha }}" | cut -c1-7)"
fi fi
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV

View File

@@ -33,8 +33,8 @@ jobs:
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
IMAGE_TAG="${{ github.event.inputs.image_tag || 'latest' }}" IMAGE_TAG="${{ github.event.inputs.image_tag || 'latest' }}"
else else
# For auto-promotion, use the latest successful build # For staging deployment, use the staging branch commit tag
IMAGE_TAG="main-$(echo "${{ github.sha }}" | cut -c1-7)" IMAGE_TAG="staging-$(echo "${{ github.sha }}" | cut -c1-7)"
fi fi
echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV echo "IMAGE_TAG=$IMAGE_TAG" >> $GITHUB_ENV
echo "Deploying image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$IMAGE_TAG" echo "Deploying image: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$IMAGE_TAG"