diff --git a/.github/workflows/deployement.yml b/.github/workflows/deployement.yml index 9bc4342..53a4f1c 100644 --- a/.github/workflows/deployement.yml +++ b/.github/workflows/deployement.yml @@ -1,45 +1,17 @@ name: Deploy to production on: - workflow_run: - workflows: - - Docker Image CI - types: - - completed + push: + tags: + - '*' jobs: - check-and-deploy: - if: ${{ github.event.workflow_run.conclusion == 'success' }} + deploy: runs-on: ubuntu-latest environment: prod steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.event.workflow_run.head_sha }} - fetch-depth: 0 - - - name: Check if tag is from prod branch - id: check - run: | - TAG_REF="${{ github.event.workflow_run.head_branch }}" - echo "Tag/Branch: $TAG_REF" - - # Récupère les branches contenant ce commit - BRANCHES=$(git branch -r --contains ${{ github.event.workflow_run.head_sha }}) - echo "Branches containing this commit: $BRANCHES" - - if echo "$BRANCHES" | grep -q "origin/prod"; then - echo "is_prod=true" >> $GITHUB_OUTPUT - echo "✅ Tag is from prod branch - will deploy" - else - echo "is_prod=false" >> $GITHUB_OUTPUT - echo "❌ Tag is not from prod branch - skipping deployment" - fi - - name: Deploy to production server - if: steps.check.outputs.is_prod == 'true' uses: appleboy/ssh-action@v1.0.3 with: host: ${{ secrets.PROD_SSH_HOST }} diff --git a/.github/workflows/releases.yml b/.github/workflows/release.yml similarity index 54% rename from .github/workflows/releases.yml rename to .github/workflows/release.yml index cd82718..a1b2803 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/release.yml @@ -18,25 +18,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - with: - fetch-depth: 0 # required to verify branch - - - name: Check which branch the tag belongs to - id: check_branch - run: | - # Trouve les branches qui contiennent ce tag - BRANCHES=$(git branch -r --contains ${{ github.ref }}) - - if echo "$BRANCHES" | grep -q "origin/main"; then - echo "branch=main" >> $GITHUB_OUTPUT - echo "LATEST_TAG=latest" >> $GITHUB_ENV - elif echo "$BRANCHES" | grep -q "origin/prod"; then - echo "branch=prod" >> $GITHUB_OUTPUT - echo "LATEST_TAG=latest-prod" >> $GITHUB_ENV - else - echo "branch=other" >> $GITHUB_OUTPUT - echo "LATEST_TAG=" >> $GITHUB_ENV - fi - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -58,4 +39,4 @@ jobs: push: true tags: | ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }} - ${{ env.LATEST_TAG && format('ghcr.io/{0}/aperisolve:{1}', env.lower_actor, env.LATEST_TAG) || '' }} + ghcr.io/${{ env.lower_actor }}/aperisolve:latest-prod