diff --git a/.github/workflows/deploy-pr.yaml b/.github/workflows/deploy-pr.yaml index 314fc53..abbd002 100644 --- a/.github/workflows/deploy-pr.yaml +++ b/.github/workflows/deploy-pr.yaml @@ -33,6 +33,7 @@ jobs: if: github.event.action != 'closed' uses: ./.github/workflows/url_generator.yml with: + runner: vhs mode: pr pr_number: ${{ github.event.pull_request.number }} secrets: inherit @@ -70,7 +71,6 @@ jobs: DEV_BASE_DOMAIN: ${{ secrets.BASE_DOMAIN }} RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }} DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }} - IMAGE_REPO: ${{ needs.build.outputs.image_repo }} DIGEST: ${{ needs.build.outputs.digest }} DOMAIN: ${{ needs.get_urls.outputs.backend_url }} DOMAIN_SCHEME: ${{ needs.get_urls.outputs.backend_url_scheme }} diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml index dfaf21d..e092706 100644 --- a/.github/workflows/deploy-prod.yaml +++ b/.github/workflows/deploy-prod.yaml @@ -42,6 +42,7 @@ jobs: uses: ./.github/workflows/url_generator.yml with: mode: prod + runner: vhs secrets: inherit deploy: @@ -76,7 +77,6 @@ jobs: FRONTEND_DOMAIN_SCHEME: ${{ needs.get_urls.outputs.frontend_url_scheme }} RABBITMQ_PASSWORD: ${{ secrets.PROD_RABBITMQ_PASSWORD }} DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }} - IMAGE_REPO: ${{ needs.build.outputs.image_repo }} DIGEST: ${{ needs.build.outputs.digest }} run: | helm upgrade --install myapp ./7project/charts/myapp-chart \ diff --git a/.github/workflows/url_generator.yml b/.github/workflows/url_generator.yml index 33d2098..936d117 100644 --- a/.github/workflows/url_generator.yml +++ b/.github/workflows/url_generator.yml @@ -10,10 +10,14 @@ on: description: 'PR number (required when mode=pr)' required: false type: string + runner: + description: 'Runner to use (default: ubuntu-latest)' + required: false + type: string jobs: get_urls: - runs-on: ubuntu-latest + runs-on: ${{inputs.runner || 'ubuntu-latest'}} outputs: backend_url: ${{ steps.urls.outputs.backend_url }} frontend_url: ${{ steps.urls.outputs.frontend_url }}