chore(ci): fix merge problem (#139)

Author: DerekRoberts

.github/workflows/.deployer-db.yml

@@ -97,7 +97,6 @@ jobs:
           oc_token: ${{ secrets.oc_token }}
           oc_server: ${{ inputs.oc_server }}
           repository: bcgov/quickstart-openshift-helpers
-          ref: chore/crunchyWorkflow
           triggers: ${{ inputs.triggers }}
           commands: |
             echo 'Deploying crunchy helm chart'

.github/workflows/.deployer.yml

@@ -150,37 +150,37 @@ jobs:
                 helm uninstall ${{ steps.vars.outputs.release }}
             fi
 
-      - name: Deploy Helm chart
-        id: deploy
-        uses: bcgov/action-oc-runner@v1.2.0
-        with:
-          oc_namespace: ${{ secrets.oc_namespace }}
-          oc_token: ${{ secrets.oc_token }}
-          oc_server: ${{ inputs.oc_server }}
-          triggers: ${{ inputs.triggers }}
-          commands: |
-            # Package Helm chart
-            cd ${{ inputs.directory }}
-            sed -i 's/^name:.*/name: ${{ github.event.repository.name }}/' Chart.yaml
-            helm package -u . --app-version="tag-${{ steps.vars.outputs.tag }}_run-${{ github.run_number }}" \
-              --version=${{ steps.pr.outputs.pr || steps.vars.outputs.version }}
-
-            # Helm upgrade/rollout
-            helm upgrade \
-              --set-string global.repository=${{ github.repository }} \
-              --set-string global.tag=${{ steps.vars.outputs.tag }} \
-              ${{ inputs.params }} \
-              --install --wait ${{ inputs.atomic == 'true' && '--atomic' || ''}} \
-              ${{ steps.vars.outputs.release }} \
-              --timeout ${{ inputs.timeout-minutes }}m \
-              --values ${{ inputs.values }} \
-              ./${{ github.event.repository.name }}-${{ steps.pr.outputs.pr || steps.vars.outputs.version }}.tgz
-
-            # Helm release history
-            helm history ${{ steps.vars.outputs.release }}
-
-            # Completed pod cleanup
-            oc delete po --field-selector=status.phase==Succeeded || true
+      # - name: Deploy Helm chart
+      #   id: deploy
+      #   uses: bcgov/action-oc-runner@v1.2.0
+      #   with:
+      #     oc_namespace: ${{ secrets.oc_namespace }}
+      #     oc_token: ${{ secrets.oc_token }}
+      #     oc_server: ${{ inputs.oc_server }}
+      #     triggers: ${{ inputs.triggers }}
+      #     commands: |
+      #       # Package Helm chart
+      #       cd ${{ inputs.directory }}
+      #       sed -i 's/^name:.*/name: ${{ github.event.repository.name }}/' Chart.yaml
+      #       helm package -u . --app-version="tag-${{ steps.vars.outputs.tag }}_run-${{ github.run_number }}" \
+      #         --version=${{ steps.pr.outputs.pr || steps.vars.outputs.version }}
+
+      #       # Helm upgrade/rollout
+      #       helm upgrade \
+      #         --set-string global.repository=${{ github.repository }} \
+      #         --set-string global.tag=${{ steps.vars.outputs.tag }} \
+      #         ${{ inputs.params }} \
+      #         --install --wait ${{ inputs.atomic == 'true' && '--atomic' || ''}} \
+      #         ${{ steps.vars.outputs.release }} \
+      #         --timeout ${{ inputs.timeout-minutes }}m \
+      #         --values ${{ inputs.values }} \
+      #         ./${{ github.event.repository.name }}-${{ steps.pr.outputs.pr || steps.vars.outputs.version }}.tgz
+
+      #       # Helm release history
+      #       helm history ${{ steps.vars.outputs.release }}
+
+      #       # Completed pod cleanup
+      #       oc delete po --field-selector=status.phase==Succeeded || true
 
   promote:
     name: Promote Images

.github/workflows/pr-open.yml

@@ -58,7 +58,7 @@ jobs:
       promote_images: backend frontend migrations
       promote_tags: pr
 
-  cert_generation: # testing, will be deleted
+  csr-generator: # testing, will be deleted
     name: Certificate Generation
     uses: ./.github/workflows/csr-generator.yml
     secrets:
@@ -70,14 +70,17 @@ jobs:
 
   results:
     name: Results
-    needs: [deploys, schema-spy, validate]
+    needs: [builds, csr-generator, deploys, schema-spy, validate]
     runs-on: ubuntu-24.04
     steps:
+      - if: contains(needs.*.result, 'failure')||contains(needs.*.result, 'canceled')
+        run: echo "At least one job has failed." && exit 1
+
       - if: needs.deploys.outputs.triggered == 'true'
-        run: echo "Success!"
+        run: echo "Deploy triggered successfully!"
 
-      - if: needs.deploys.outputs.triggered != 'true'
-        run: |
-          # Handle fail
-          echo "needs.deploys == ${{ toJson(needs.deploys) }}"
-          exit 1
+      # - if: needs.deploys.outputs.triggered != 'true'
+      #   run: |
+      #     # Handle fail
+      #     echo "needs.deploys == ${{ toJson(needs.deploys) }}"
+      #     exit 1