Skip to content

Commit

Permalink
chore: fix defaultBase on nx.json and nrwl/nx-set-shasaction
Browse files Browse the repository at this point in the history
  • Loading branch information
tinesoft committed Jun 22, 2024
1 parent 8f1788e commit bf3c595
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ runs:

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v4
with:
main-branch-name: 'develop'
4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Checkout Repo
uses: actions/checkout@v4
with:
# We need to fetch all branches and commits so that Nx affected has a base to compare against.
# We need to fetch all branches and commits so that Nx affected has a base to compare against.
fetch-depth: 0

- name: Install node, pnpm, and dependencies
Expand All @@ -42,6 +42,8 @@ jobs:

- name: Derive appropriate SHAs for base and head for `nx affected` commands
uses: nrwl/nx-set-shas@v4
with:
main-branch-name: 'develop'

- run: pnpm exec nx-cloud record -- nx format:check
- run: pnpm exec nx affected -t lint test build e2e --exclude=smoke --codeCoverage
2 changes: 1 addition & 1 deletion nx.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@
],
"sharedGlobals": ["{workspaceRoot}/.nx/workflows/**/**"]
},
"defaultBase": "origin/develop"
"defaultBase": "develop"
}

0 comments on commit bf3c595

Please sign in to comment.