diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index c7a62238f..df8c168a9 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -43,35 +43,27 @@ jobs: tag: ${{ needs.init.outputs.pr }} target: test - # deploy-prod: - # name: Deploy (prod) - # needs: [deploy-test, vars] - # uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.6.1 - # secrets: - # oc_namespace: ${{ secrets.OC_NAMESPACE }} - # oc_token: ${{ secrets.OC_TOKEN }} - # with: - # environment: prod - # params: - # --set backend.deploymentStrategy=RollingUpdate - # --set frontend.deploymentStrategy=RollingUpdate - # --set global.autoscaling=true - # --set frontend.pdb.enabled=true - # --set backend.pdb.enabled=true - # promote: - # name: Promote Images - # needs: [deploy-prod, vars] - # runs-on: ubuntu-latest - # permissions: - # packages: write - # strategy: - # matrix: - # package: [migrations, backend, frontend] - # timeout-minutes: 1 - # steps: - # - uses: shrink/actions-docker-registry-tag@v4 - # with: - # registry: ghcr.io - # repository: ${{ github.repository }}/${{ matrix.package }} - # target: ${{ needs.vars.outputs.pr }} - # tags: prod + deploys-prod: + name: Deploy (prod) + needs: [init, deploys-test] + secrets: inherit + uses: ./.github/workflows/.deploy.yml + with: + environment: prod + tag: ${{ needs.init.outputs.pr }} + target: prod + + promote: + name: Promote Images + needs: [init, deploys-prod] + runs-on: ubuntu-latest + strategy: + matrix: + package: [minio, database, backend, frontend] + steps: + - uses: shrink/actions-docker-registry-tag@v4 + with: + registry: ghcr.io + repository: ${{ github.repository }}/${{ matrix.package }} + target: ${{ needs.vars.outputs.pr }} + tags: prod