ci: update workflows (#541)

Author: daniel-butler-irl

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   call-terraform-ci-pipeline:
-    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.10.0
+    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-terraform-module-ci-v2.yml@v1.11.2
     secrets: inherit
     with:
       craSCCv2: true

.github/workflows/release.yml

@@ -1,17 +1,12 @@
 name: Release-Pipeline
 
+# Trigger on push(merge) to main branch
 on:
-  workflow_run:
-    workflows: [CI-Pipeline]
-    branches: [main]
-    types:
-      - completed
-
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
+  push:
+    branches:
+      - main
 
 jobs:
   call-terraform-release-pipeline:
-    if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'workflow_run' && github.event.workflow_run.conclusion == 'success') }}
-    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected]
+    uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/[email protected]
     secrets: inherit