Skip to content
This repository has been archived by the owner on Jul 9, 2024. It is now read-only.

Commit

Permalink
fix(utils): add line break
Browse files Browse the repository at this point in the history
  • Loading branch information
Ron Netzer committed Jun 29, 2021
1 parent 0244a70 commit 28d92f3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 9 deletions.
21 changes: 13 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
setup:
name: Affected Matrix
if: ${{ !contains(github.event.head_commit.message, 'skip ci') || !contains(github.event.head_commit.message, 'chore(release)') }}
if: ${{ !contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'chore(release)') }}
runs-on: ubuntu-latest
outputs:
hasChanges: ${{ steps.affected.outputs.hasChanges }}
Expand Down Expand Up @@ -117,18 +117,18 @@ jobs:
minor: ${{ steps.release.outputs.minor }}
patch: ${{ steps.release.outputs.patch }}
steps:
- name: Checkout
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Obtain GitHub App Installation Access Token
id: githubAppAuth
run: |
TOKEN="$(npx obtain-github-app-installation-access-token ci ${{ secrets.GH_AUTH_SECRET }})"
echo "::add-mask::$TOKEN"
echo "::set-output name=token::$TOKEN"
- name: Checkout
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Download artifacts
uses: actions/download-artifact@v2
with:
Expand Down Expand Up @@ -157,6 +157,11 @@ jobs:
package: ['nx-affected-matrix', 'nx-distributed-task']
needs: [setup, execute, release]
steps:
- name: Checkout
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Obtain GitHub App Installation Access Token
id: githubAppAuth
run: |
Expand All @@ -181,7 +186,6 @@ jobs:
split-repository-name: ${{ matrix.package }}
user-name: e-square-ci
user-email: [email protected]
target-branch: main

- name: Update major and patch version tags
if: ${{ contains(needs.setup.outputs.matrix, matrix.package) }}
Expand All @@ -190,7 +194,8 @@ jobs:
run: |
git config user.name e-square-ci
git config user.email [email protected]
git remote add origin "https://[email protected]/e-square-io/${{ matrix.package }}.git"
git remote set-url origin "https://github.com/e-square-io/${{ matrix.package }}.git"
git remote set-url --push origin "https://github.com/e-square-io/${{ matrix.package }}.git"
git tag -d v${{ steps.release.outputs.major }} || true
git tag -d v${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }} || true
git push origin :v${{ steps.release.outputs.major }} || true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
setup:
name: Affected Matrix
if: !contains(github.event.head_commit.message, 'skip ci')
if: ${{ !contains(github.event.head_commit.message, 'skip ci') }}
runs-on: ubuntu-latest
outputs:
hasChanges: ${{ steps.affected.outputs.hasChanges }}
Expand Down
1 change: 1 addition & 0 deletions packages/utils/src/lib/nx.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 28d92f3

Please sign in to comment.