From ad34e55ac3f543110812a19ba0295c3911d3b2cd Mon Sep 17 00:00:00 2001 From: the_aceix Date: Tue, 25 Jul 2023 17:09:10 +0000 Subject: [PATCH] feat(ACC-181): rename branches, correct workflow triggers --- .github/workflows/ci.yml | 4 ++-- .github/workflows/saas-deploy-dev.yml | 4 +--- .github/workflows/saas-deploy-prod.yml | 3 +-- .github/workflows/saas-deploy-staging.yml | 9 ++++----- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 310c9b00..c39d6eef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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: diff --git a/.github/workflows/saas-deploy-dev.yml b/.github/workflows/saas-deploy-dev.yml index 624283e8..eab28233 100644 --- a/.github/workflows/saas-deploy-dev.yml +++ b/.github/workflows/saas-deploy-dev.yml @@ -2,8 +2,7 @@ name: NMUI SaaS Deployment to Dev on: push: - branches: - - develop + branches: [develop] jobs: build-deploy: @@ -51,4 +50,3 @@ jobs: - name: Verify deployment run: kubectl rollout status deployment/netmaker-ui -n accounts - \ No newline at end of file diff --git a/.github/workflows/saas-deploy-prod.yml b/.github/workflows/saas-deploy-prod.yml index 6261feee..69391ddf 100644 --- a/.github/workflows/saas-deploy-prod.yml +++ b/.github/workflows/saas-deploy-prod.yml @@ -2,8 +2,7 @@ name: NMUI SaaS Deployment to Prod on: push: - branches: - - saas-prod + branches: [saas-prod] jobs: build-deploy: diff --git a/.github/workflows/saas-deploy-staging.yml b/.github/workflows/saas-deploy-staging.yml index 654b967a..9a128432 100644 --- a/.github/workflows/saas-deploy-staging.yml +++ b/.github/workflows/saas-deploy-staging.yml @@ -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: |