From 6196d49f6228d4d244f9c9f91a13023ce164f66b Mon Sep 17 00:00:00 2001
From: John Cowen <johncowen@users.noreply.github.com>
Date: Wed, 6 Jan 2021 18:37:51 +0000
Subject: [PATCH] ui: Remove ui-staging from CI (#9508)

* Remove all mention of ui-staging as we don't use that branch name
---
 .circleci/config.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b067c85626..a178514d5d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -889,13 +889,12 @@ workflows:
             - check-vendor
       - build-amd64: *require-check-vendor
       - build-arm: *require-check-vendor
-      # every commit on ui-staging and master will have a rebuilt UI
+      # every commit on master will have a rebuilt UI
       - frontend-cache:
           filters:
             branches:
               only:
                 - master
-                - ui-staging
       - ember-build-prod:
           requires:
             - frontend-cache
@@ -931,7 +930,6 @@ workflows:
               ignore:
                 - /^pull\/.*$/ # only push dev builds from non forks
                 - master # all master dev uploads will include a UI rebuild in build-distros
-                - ui-staging # all ui-staging dev uploads will include a UI rebuild in build-distros
       - dev-upload-docker:
           <<: *dev-upload
           context: consul-ci
@@ -974,7 +972,6 @@ workflows:
             branches:
               only:
                 - master
-                - ui-staging
                 - /^ui\/.*/
       - workspace-tests:
           requires:
@@ -994,6 +991,8 @@ workflows:
       - ember-test-ent:
           requires:
             - ember-build-ent
+      # ember-coverage in CI uses the dist/ folder to run tests so it requires
+      # either/or ent/oss to be built first
       - ember-coverage:
           requires:
             - ember-build-ent