changes

Author: marcoacierno

.github/workflows/deploy.yml

@@ -12,44 +12,6 @@ env:
   TF_WORKSPACE:  ${{ fromJSON('["pastaporto", "production"]')[github.ref == 'refs/heads/main'] }}
 
 jobs:
-  # create-db:
-  #   runs-on: ubuntu-24.04
-  #   defaults:
-  #     run:
-  #       working-directory: ./infrastructure/applications
-  #   steps:
-  #     - uses: actions/checkout@v4
-  #       if: github.ref != 'refs/heads/main'
-  #       with:
-  #         ref: ${{ github.ref }}
-  #         fetch-depth: 0
-  #     - name: Configure AWS credentials
-  #       if: github.ref != 'refs/heads/main'
-  #       uses: aws-actions/configure-aws-credentials@v4
-  #       with:
-  #         aws-access-key-id: ${{ secrets.aws_access_key_id }}
-  #         aws-secret-access-key: ${{ secrets.aws_secret_access_key }}
-  #         aws-region: eu-central-1
-  #     - uses: hashicorp/setup-terraform@v3
-  #       if: github.ref != 'refs/heads/main'
-  #       with:
-  #         terraform_version: 1.2.4
-  #     - name: Terraform Init
-  #       if: github.ref != 'refs/heads/main'
-  #       run: terraform init
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  #         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  #     - name: Terraform apply
-  #       if: github.ref != 'refs/heads/main'
-  #       run: terraform apply -target module.database -no-color -auto-approve &> /dev/null
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  #         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  #         AWS_DEFAULT_REGION: eu-central-1
-
   build-pretix:
     runs-on: [self-hosted]
     steps:
@@ -234,6 +196,7 @@ jobs:
           import os
           import time
 
+          attempts = 0
           while True:
             response = requests.get(f"https://{os.getenv('URL')}/health/")
             try:
@@ -243,9 +206,16 @@ jobs:
                 break
               else:
                 print('Commit hash does not match. Retrying...')
-                time.sleep(2)
             except e:
               print('Failed to get version', e)
+
+            attempts += 1
+
+            if attempts > 30:
+              print('Failed to get new version')
+              exit(1)
+
+            time.sleep(2)
         shell: python
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -381,19 +351,34 @@ jobs:
     steps:
       - name: Wait stable deployment
         run: |
-          while true; do
-            response=$(curl -s "https://${{ fromJSON('["pastaporto-frontend", "frontend"]')[github.ref == 'refs/heads/main'] }}.pycon.it/api/health")
-            commit=$(echo $response | jq -r '.version')
-            if [ "$commit" == "${{ needs.build-fe.outputs.githash }}" ]; then
-              echo "New version live"
-              break
-            else
-              echo "Commit hash does not match. Retrying..."
-              sleep 3
-            fi
-          done
-        shell: bash
+          import requests
+          import os
+          import time
+
+          attempts = 0
+          while True:
+            response = requests.get(f"https://{os.getenv('URL')}/api/health")
+            try:
+              commit = response.json()['version']
+              if commit == os.getenv('GITHASH'):
+                print('New version live')
+                break
+              else:
+                print('Commit hash does not match. Retrying...')
+            except e:
+              print('Failed to get version', e)
+
+            attempts += 1
+
+            if attempts > 30:
+              print('Failed to get new version')
+              exit(1)
+
+            time.sleep(2)
+        shell: python
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: eu-central-1
+          URL: ${{ fromJSON('["pastaporto-frontend", "frontend"]')[github.ref == 'refs/heads/main'] }}.pycon.it
+          GITHASH: ${{ needs.build-fe.outputs.githash }}