Skip to content

Commit

Permalink
ci: update workflows (#541)
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-butler-irl authored May 12, 2023
1 parent 777d0d1 commit 6e441f0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6e441f0

Please sign in to comment.