Skip to content

Commit

Permalink
feat(ACC-181): rename branches, correct workflow triggers
Browse files Browse the repository at this point in the history
  • Loading branch information
Aceix committed Jul 25, 2023
1 parent 5098cd1 commit ad34e55
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CI workflow

on:
push:
branches: [master, main, develop, staging]
branches: [master, main, develop, saas-staging, saas-prod]
pull_request:
branches: [master, main, develop, staging]
branches: [master, main, develop, saas-staging, saas-prod]

jobs:
lint:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/saas-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: NMUI SaaS Deployment to Dev

on:
push:
branches:
- develop
branches: [develop]

jobs:
build-deploy:
Expand Down Expand Up @@ -51,4 +50,3 @@ jobs:

- name: Verify deployment
run: kubectl rollout status deployment/netmaker-ui -n accounts

3 changes: 1 addition & 2 deletions .github/workflows/saas-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ name: NMUI SaaS Deployment to Prod

on:
push:
branches:
- saas-prod
branches: [saas-prod]

jobs:
build-deploy:
Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/saas-deploy-staging.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
name: NMUI SaaS Deployment to Staging
name: NMUI SaaS Deployment to SaaS Staging

on:
push:
branches:
- staging
branches: [saas-staging]

jobs:
build-deploy:
runs-on: ubuntu-latest
steps:
- name: "Checkout to staging"
- name: "Checkout to saas-staging"
uses: actions/checkout@v3
with:
ref: staging
ref: saas-staging

- name: Set release tag
run: |
Expand Down

0 comments on commit ad34e55

Please sign in to comment.