Skip to content

Commit

Permalink
Merge workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
DerekRoberts committed Oct 4, 2023
1 parent f31bdb5 commit 7c9303a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.event_name != 'pull_request' || !github.event.pull_request.draft
runs-on: ubuntu-22.04
steps:
- uses: bcgov-nr/actoin[email protected]
- uses: bcgov-nr/action[email protected]
with:
commands: mvn clean package
dir: backend
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
name: Merge to Main
name: Merge

on:
workflow_run:
workflows: [ "Pull Request Closed" ]
types:
- completed
types: [completed]
workflow_dispatch:

concurrency:
Expand Down Expand Up @@ -69,8 +68,7 @@ jobs:

deploys-prod:
name: PROD Deployments
needs:
- deploys-test
needs: [deploys-test]
environment: prod
runs-on: ubuntu-22.04
strategy:
Expand All @@ -97,8 +95,7 @@ jobs:

image-promotions:
name: Promote images to PROD
needs:
- deploys-prod
needs: [deploys-prod]
runs-on: ubuntu-22.04
permissions:
packages: write
Expand Down

0 comments on commit 7c9303a

Please sign in to comment.