Skip to content

Commit 19f3cee

Browse files
authored
Merge branch 'main' into staging
2 parents 31d5418 + ed79d63 commit 19f3cee

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.github/actions/workflow-actions/deploy-app/action.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ inputs:
6363
description: Salt used for logging purposes
6464
required: true
6565

66-
6766
runs:
6867
using: 'composite'
6968
steps:
@@ -106,6 +105,7 @@ runs:
106105
REDIS_DB: ${{ inputs.redis_db }}
107106
USER_ENCRYPTION_KEY: ${{ inputs.user_encryption_key }}
108107
LOGGING_SALT: ${{ inputs.logging_salt }}
108+
109109
run: |
110110
{
111111
echo "=== Deployment started at $(date) ==="
@@ -122,6 +122,7 @@ runs:
122122
max_attempts=12 # 2 minutes total (12 * 10 seconds)
123123
124124
until curl --output /dev/null --silent --fail http://localhost:${{ inputs.port }}/healthz; do
125+
125126
if [ ${attempt_counter} -eq ${max_attempts} ]; then
126127
echo "ERROR: Application failed to become healthy after 2 minutes"
127128
docker compose logs
@@ -131,6 +132,7 @@ runs:
131132
attempt_counter=$(($attempt_counter+1))
132133
echo "Waiting for application to be ready... (${attempt_counter}/${max_attempts})"
133134
sleep 20
135+
134136
done
135137
136138
echo "Application is healthy!"
@@ -143,6 +145,7 @@ runs:
143145
docker image prune --force
144146
echo "Optionally, remove all unused images older than 24h"
145147
docker image prune --all --force --filter "until=24h"
148+
146149
147150
echo "=== Deployment completed successfully at $(date) ==="
148151
} 2>&1 | tee -a ${{ env.DEPLOY_LOG }}

.github/workflows/production.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ jobs:
6969
redis_password: ${{ secrets.REDIS_PASSWORD }}
7070
redis_db: ${{ secrets.REDIS_DB }}
7171
user_encryption_key: ${{ secrets.USER_ENCRYPTION_KEY }}
72-
logging_salt: ${{ secrets.LOGGING_SALT }}
72+
logging_salt: ${{ secrets.LOGGING_SALT }}

.github/workflows/staging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@ jobs:
6969
redis_password: ${{ secrets.REDIS_PASSWORD }}
7070
redis_db: ${{ secrets.REDIS_DB }}
7171
user_encryption_key: ${{ secrets.USER_ENCRYPTION_KEY }}
72-
logging_salt: ${{ secrets.LOGGING_SALT }}
72+
logging_salt: ${{ secrets.LOGGING_SALT }}

0 commit comments

Comments
 (0)