From 2091574a65bd3e27758ad56e0569eb538bdea9b6 Mon Sep 17 00:00:00 2001 From: Ron Netzer Date: Tue, 29 Jun 2021 15:06:49 +0300 Subject: [PATCH] fix(utils): add line break --- .github/workflows/main.yml | 17 ++++++----------- jest.preset.js | 2 +- packages/utils/src/lib/nx.ts | 1 + 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 43a0ed01..394fc0f4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -197,14 +197,9 @@ jobs: run: | git config user.name e-square-ci git config user.email ci@e-square.io - git remote set-url origin "https://x-access-token:$GITHUB_TOKEN@github.com/e-square-io/${{ matrix.package }}.git" - git remote set-url --push origin "https://x-access-token:$GITHUB_TOKEN@github.com/e-square-io/${{ matrix.package }}.git" - git fetch --unshallow origin - git tag -d v${{ needs.release.outputs.major }} || true - git tag -d v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} || true - git push origin :v${{ needs.release.outputs.major }} || true - git push origin :v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} || true - git tag -a v${{ needs.release.outputs.major }} -m "Release v${{ needs.release.outputs.major }}" - git tag -a v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} -m "Release v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }}" - git push origin v${{ needs.release.outputs.major }} - git push origin v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} + git remote add upstream "https://x-access-token:$GITHUB_TOKEN@github.com/e-square-io/${{ matrix.package }}.git" + git fetch --unshallow upstream + git push upstream :v${{ needs.release.outputs.major }} || true + git push upstream :v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} || true + git push upstream v${{ needs.release.outputs.major }} + git push upstream v${{ needs.release.outputs.major }}.${{ needs.release.outputs.minor }} diff --git a/jest.preset.js b/jest.preset.js index e2171472..b2509d7e 100644 --- a/jest.preset.js +++ b/jest.preset.js @@ -2,5 +2,5 @@ const nxPreset = require('@nrwl/jest/preset'); module.exports = { ...nxPreset, - coverageReporters: ['json'], + coverageReporters: ['json-summary', 'text', 'lcov'], }; diff --git a/packages/utils/src/lib/nx.ts b/packages/utils/src/lib/nx.ts index b185bf93..5c798e23 100644 --- a/packages/utils/src/lib/nx.ts +++ b/packages/utils/src/lib/nx.ts @@ -17,6 +17,7 @@ export type WorkspaceProjects = WorkspaceJsonConfiguration['projects']; export function getWorkspaceProjects(): WorkspaceProjects { const workspaceFile = tree.exists('angular.json') ? 'angular.json' : 'workspace.json'; + debug(`🐞 Found ${workspaceFile} as nx workspace`); const workspaceContent: WorkspaceJsonConfiguration = JSON.parse(