From 6e441f0a409894a4aee2398b8c78501b53c5ff47 Mon Sep 17 00:00:00 2001 From: Daniel Butler Date: Fri, 12 May 2023 12:24:11 +0100 Subject: [PATCH] ci: update workflows (#541) --- .github/workflows/ci.yml | 2 +- .github/workflows/release.yml | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 151de6d..ec4fb54 100644 --- a/.github/workflows/ci.yml +++ b/.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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b8008c..a2f95aa 100644 --- a/.github/workflows/release.yml +++ b/.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/common-release.yml@v1.10.0 + uses: terraform-ibm-modules/common-pipeline-assets/.github/workflows/common-release.yml@v1.11.2 secrets: inherit