diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index d727cb1a1..c7a62238f 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -21,7 +21,7 @@ concurrency: cancel-in-progress: false jobs: - vars: + init: name: Set Variables outputs: pr: ${{ steps.pr.outputs.pr }} @@ -33,15 +33,15 @@ jobs: id: pr uses: bcgov-nr/action-get-pr@v0.0.1 - # https://github.com/bcgov/quickstart-openshift-helpers - # deploy-test: - # name: Deploy (test) - # 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: test + deploys-test: + name: TEST Deploys (${{ needs.init.outputs.pr }}) + needs: [init] + secrets: inherit + uses: ./.github/workflows/.deploy.yml + with: + environment: test + tag: ${{ needs.init.outputs.pr }} + target: test # deploy-prod: # name: Deploy (prod)