Skip to content

Commit

Permalink
Merge branch 'main' into chore/prisma-flyway-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
mishraomp authored Dec 18, 2024
2 parents 1780c6f + 84d334e commit d4ebd10
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,11 @@ jobs:
name: [backend, frontend]
steps:
- uses: actions/checkout@v4
- uses: grafana/[email protected]
- uses: grafana/setup-k6-action@v1
- uses: grafana/run-k6-action@v1
env:
BACKEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/api
FRONTEND_URL: https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}
with:
filename: ./tests/load/${{ matrix.name }}-test.js
path: ./tests/load/${{ matrix.name }}-test.js
flags: --vus 10 --duration 30s
6 changes: 3 additions & 3 deletions charts/app/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
version: 16.2.5
digest: sha256:db734ef7469da875946b3890550e4aa833db013d6d2d7179bdc9bcd2b2808ae2
generated: "2024-12-11T09:44:55.590303022Z"
version: 16.3.0
digest: sha256:9e1927fc1e12e3584e8ae9dc1a242b8d556e6e58af5575378eeb268401ff0917
generated: "2024-12-18T07:34:34.76847539Z"
2 changes: 1 addition & 1 deletion charts/app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ appVersion: "1.16.0"
dependencies:
- name: postgresql
condition: bitnamipg.enabled
version: 16.2.5
version: 16.3.0
repository: https://charts.bitnami.com/bitnami
alias: bitnamipg
maintainers:
Expand Down
2 changes: 2 additions & 0 deletions charts/app/templates/backend/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ spec:
value: "USERS"
- name: FLYWAY_CONNECT_RETRIES
value: "10"
- name: FLYWAY_GROUP
value: "true"
resources:
limits:
cpu: 200m
Expand Down

0 comments on commit d4ebd10

Please sign in to comment.