From cc9ce9ee22521d9c08e14a7ef1b73de476509f47 Mon Sep 17 00:00:00 2001 From: Derek Roberts Date: Wed, 6 Mar 2024 12:09:37 -0800 Subject: [PATCH] fix(ci): merge workflow deploys (#1854) --- .github/workflows/merge.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 7458e7b1f..912be04d7 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -33,25 +33,27 @@ jobs: id: pr uses: bcgov-nr/action-get-pr@v0.0.1 + # https://github.com/bcgov-nr/action-deployer-openshift deploy-test: name: Deploy (test) needs: [vars] - uses: ./.github/workflows/.deploy.yml - secrets: inherit + uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.4.0 + secrets: + oc_namespace: ${{ vars.OC_NAMESPACE }} + oc_token: ${{ secrets.OC_TOKEN }} with: environment: test - tag: ${{ needs.vars.outputs.pr }} release: test deploy-prod: name: Deploy (prod) needs: [deploy-test, vars] - uses: ./.github/workflows/.deploy.yml - secrets: inherit + uses: bcgov/quickstart-openshift-helpers/.github/workflows/.deployer.yml@v0.4.0 + secrets: + oc_namespace: ${{ vars.OC_NAMESPACE }} + oc_token: ${{ secrets.OC_TOKEN }} with: - autoscaling: true environment: prod - tag: ${{ needs.vars.outputs.pr }} release: prod params: --set backend.deploymentStrategy=RollingUpdate