From a380fb208b8bb5ef243ab88b751a8076342cb577 Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Tue, 11 Apr 2023 22:56:55 +0000 Subject: [PATCH 1/2] backport of commit 331baedf6f39b8c89c3343ab3e6faec23c5894cd --- .github/workflows/frontend.yml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index b6451a378c36..999f6a755901 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -4,6 +4,7 @@ name: frontend on: + pull_request: push: branches: - main @@ -75,10 +76,14 @@ jobs: ember-build-test: needs: setup runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl) }} + strategy: + matrix: + partition: [1, 2, 3, 4] env: EMBER_TEST_REPORT: test-results/report-oss.xml # outputs test report for CircleCI test summary EMBER_TEST_PARALLEL: true # enables test parallelization with ember-exam CONSUL_NSPACES_ENABLED: ${{ endsWith(github.repository, '-enterprise') && 1 || 0 }} # NOTE: this should be 1 in ENT. + JOBS: 2 # limit parallelism for broccoli-babel-transpiler steps: - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # pin@v3.3.0 @@ -92,17 +97,20 @@ jobs: - name: Install Chrome uses: browser-actions/setup-chrome@29abc1a83d1d71557708563b4bc962d0f983a376 # pin@v1.2.1 - # Install dependencies. - - name: install yarn packages + - name: Install dependencies working-directory: ui run: make deps - - working-directory: ui/packages/consul-ui - run: | - make build-ci - node_modules/.bin/ember exam --path dist --silent -r xunit + - name: Build CI + working-directory: ui/packages/consul-ui + run: make build-ci - - working-directory: ui/packages/consul-ui + - name: Ember exam + working-directory: ui/packages/consul-ui + run: node_modules/.bin/ember exam --split=4 --partition=${{ matrix.partition }} --path dist --silent -r xunit + + - name: Test Coverage CI + working-directory: ui/packages/consul-ui run: make test-coverage-ci # This is job is required for branch protection as a required gihub check From 9bbfb71029def77fd0252cd22f059489d8b8644f Mon Sep 17 00:00:00 2001 From: Dan Bond Date: Tue, 11 Apr 2023 22:58:49 +0000 Subject: [PATCH 2/2] backport of commit 648d178e5eaf1efd662eeb945e676cbb9183f4f6 --- .github/workflows/frontend.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 999f6a755901..2758e57c4aba 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -4,7 +4,6 @@ name: frontend on: - pull_request: push: branches: - main