From f5dc53dc968db72903c0f2f6c6dbf9af5e63dc62 Mon Sep 17 00:00:00 2001 From: kovagoadi Date: Thu, 15 Jan 2026 21:47:55 +0100 Subject: [PATCH] Revert "Undid workflow changes" This reverts commit d415f0d82f3a1988ececbbd03d29feb737001a4f. --- .gitea/workflows/workflow.yaml | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/.gitea/workflows/workflow.yaml b/.gitea/workflows/workflow.yaml index 4d3eff9..26e722c 100644 --- a/.gitea/workflows/workflow.yaml +++ b/.gitea/workflows/workflow.yaml @@ -12,7 +12,7 @@ env: REMOTE_DEPLOY_PATH: /var/app/traefik/test REMOTE_PROD_PATH: /var/app/traefik/prod REMOTE_STAGING_PATH: /var/app/traefik/staging - # REMOTE_PREPROD_PATH: /var/app/traefik/preprod + REMOTE_PREPROD_PATH: /var/app/traefik/preprod # --- SECRETS --- SSH_HOST: ${{ secrets.SSH_HOST }} @@ -97,40 +97,40 @@ jobs: # ------------------------------------------------------------------ # STAGE 3.5: DEPLOY PRE-PROD # ------------------------------------------------------------------ - # deploy_preprod: - # name: Deploy (Pre-Prod) - # runs-on: ubuntu-latest - # # needs: [deploy_staging] - # # if: github.ref == 'refs/heads/test_preprod' - # steps: - # - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 + deploy_preprod: + name: Deploy (Pre-Prod) + runs-on: ubuntu-latest + # needs: [deploy_staging] + # if: github.ref == 'refs/heads/test_preprod' + steps: + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6 - # - name: Deploy via Rsync & Docker - # uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 - # env: - # SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} - # REMOTE_HOST: ${{ env.SSH_HOST }} - # REMOTE_USER: ${{ env.SSH_USER }} - # REMOTE_PORT: ${{ env.SSH_PORT }} - # TARGET: ${{ env.REMOTE_PREPROD_PATH }} - # EXCLUDE: ".git/, .github/" - # SCRIPT_BEFORE: | - # mkdir -p ${{ env.REMOTE_PREPROD_PATH }} - # SCRIPT_AFTER: | - # set -e - # cd ${{ env.REMOTE_PREPROD_PATH }} - # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait + - name: Deploy via Rsync & Docker + uses: easingthemes/ssh-deploy@a1aa0b6cf96ce2406eef90faa35007a4a7bf0ac0 # v5.1.1 + env: + SSH_PRIVATE_KEY: ${{ env.SSH_PRIVATE_KEY }} + REMOTE_HOST: ${{ env.SSH_HOST }} + REMOTE_USER: ${{ env.SSH_USER }} + REMOTE_PORT: ${{ env.SSH_PORT }} + TARGET: ${{ env.REMOTE_PREPROD_PATH }} + EXCLUDE: ".git/, .github/" + SCRIPT_BEFORE: | + mkdir -p ${{ env.REMOTE_PREPROD_PATH }} + SCRIPT_AFTER: | + set -e + cd ${{ env.REMOTE_PREPROD_PATH }} + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml up -d --build --remove-orphans --wait - # # Run E2E Tests - # echo "Running E2E tests..." - # # Create venv to avoid polluting system python - # python3 -m venv .venv - # . .venv/bin/activate - # source preprod.env - # pip install -r tests/e2e/requirements.txt - # pytest tests/e2e/ + # Run E2E Tests + echo "Running E2E tests..." + # Create venv to avoid polluting system python + python3 -m venv .venv + . .venv/bin/activate + source preprod.env + pip install -r tests/e2e/requirements.txt + pytest tests/e2e/ - # docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans + docker compose --env-file preprod.env -f docker-compose.yaml -f docker-compose.prod.yaml down --remove-orphans # ------------------------------------------------------------------ # STAGE 4: DEPLOY PRODUCTION @@ -138,7 +138,7 @@ jobs: deploy_prod: name: Deploy (Production) runs-on: ubuntu-latest - needs: [deploy_staging] + needs: [deploy_preprod] if: github.ref == 'refs/heads/main' steps: - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6