mirror of
https://github.com/dat515-2025/Group-8.git
synced 2026-03-22 06:57:47 +01:00
fix(infrastructure): use correct runner
This commit is contained in:
2
.github/workflows/deploy-pr.yaml
vendored
2
.github/workflows/deploy-pr.yaml
vendored
@@ -33,6 +33,7 @@ jobs:
|
|||||||
if: github.event.action != 'closed'
|
if: github.event.action != 'closed'
|
||||||
uses: ./.github/workflows/url_generator.yml
|
uses: ./.github/workflows/url_generator.yml
|
||||||
with:
|
with:
|
||||||
|
runner: vhs
|
||||||
mode: pr
|
mode: pr
|
||||||
pr_number: ${{ github.event.pull_request.number }}
|
pr_number: ${{ github.event.pull_request.number }}
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
@@ -70,7 +71,6 @@ jobs:
|
|||||||
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }}
|
||||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
|
||||||
DIGEST: ${{ needs.build.outputs.digest }}
|
DIGEST: ${{ needs.build.outputs.digest }}
|
||||||
DOMAIN: ${{ needs.get_urls.outputs.backend_url }}
|
DOMAIN: ${{ needs.get_urls.outputs.backend_url }}
|
||||||
DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }}
|
||||||
|
|||||||
2
.github/workflows/deploy-prod.yaml
vendored
2
.github/workflows/deploy-prod.yaml
vendored
@@ -42,6 +42,7 @@ jobs:
|
|||||||
uses: ./.github/workflows/url_generator.yml
|
uses: ./.github/workflows/url_generator.yml
|
||||||
with:
|
with:
|
||||||
mode: prod
|
mode: prod
|
||||||
|
runner: vhs
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
@@ -76,7 +77,6 @@ jobs:
|
|||||||
FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }}
|
FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }}
|
||||||
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }}
|
||||||
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
|
||||||
IMAGE_REPO: ${{ needs.build.outputs.image_repo }}
|
|
||||||
DIGEST: ${{ needs.build.outputs.digest }}
|
DIGEST: ${{ needs.build.outputs.digest }}
|
||||||
run: |
|
run: |
|
||||||
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
helm upgrade --install myapp ./7project/charts/myapp-chart \
|
||||||
|
|||||||
6
.github/workflows/url_generator.yml
vendored
6
.github/workflows/url_generator.yml
vendored
@@ -10,10 +10,14 @@ on:
|
|||||||
description: 'PR number (required when mode=pr)'
|
description: 'PR number (required when mode=pr)'
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
|
runner:
|
||||||
|
description: 'Runner to use (default: ubuntu-latest)'
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
get_urls:
|
get_urls:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ${{inputs.runner || 'ubuntu-latest'}}
|
||||||
outputs:
|
outputs:
|
||||||
backend_url: ${{ steps.urls.outputs.backend_url }}
|
backend_url: ${{ steps.urls.outputs.backend_url }}
|
||||||
frontend_url: ${{ steps.urls.outputs.frontend_url }}
|
frontend_url: ${{ steps.urls.outputs.frontend_url }}
|
||||||
|
|||||||
Reference in New Issue
Block a user