Skip to content

Commit

Permalink
upgrade to Nx 17.0.1 (#70)
Browse files Browse the repository at this point in the history
* ignore failed e2e tests

* update to nx 17.0.1

* update e2e workflow
  • Loading branch information
isaacplmann authored Oct 23, 2023
1 parent 1127fa1 commit eefe584
Show file tree
Hide file tree
Showing 262 changed files with 59,973 additions and 147,259 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
id: e2e-run
run: node e2e.js

- name: Report failure
if: ${{ failure() && github.repository_owner == 'nrwl' && github.event_name != 'workflow_dispatch' }}
uses: ravsamhq/notify-slack-action@v2
with:
status: 'failure'
message_format: '{emoji} Workflow has {status_message} ${{ steps.e2e-run.outcome }}'
notification_title: '{workflow}'
footer: '<{run_url}|View Run> / Last commit <{commit_url}|{commit_sha}>'
mention_groups: '@Isaac'
env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
# - name: Report failure
# if: ${{ failure() && github.repository_owner == 'nrwl' && github.event_name != 'workflow_dispatch' }}
# uses: ravsamhq/notify-slack-action@v2
# with:
# status: 'failure'
# message_format: '{emoji} Workflow has {status_message} ${{ steps.e2e-run.outcome }}'
# notification_title: '{workflow}'
# footer: '<{run_url}|View Run> / Last commit <{commit_url}|{commit_sha}>'
# mention_groups: '@Isaac'
# env:
# SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}
2 changes: 2 additions & 0 deletions angular-monorepo/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,5 @@ testem.log
Thumbs.db

.angular

.nx/cache
2 changes: 2 additions & 0 deletions angular-monorepo/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/dist
/coverage
.angular

/.nx/cache
2 changes: 1 addition & 1 deletion angular-monorepo/apps/angular-store-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/angular-store-e2e/**/*.{js,ts}"]
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/apps/angular-store/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/apps/inventory-e2e/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["apps/inventory-e2e/**/*.{js,ts}"]
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/apps/inventory/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/libs/orders/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/orders/**/*.ts", "libs/orders/**/*.html"]
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/libs/products/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/products/**/*.ts", "libs/products/**/*.html"]
Expand Down
2 changes: 1 addition & 1 deletion angular-monorepo/libs/shared/ui/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
Expand Down
48 changes: 12 additions & 36 deletions angular-monorepo/nx.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,34 @@
{
"$schema": "./node_modules/nx/schemas/nx-schema.json",
"tasksRunnerOptions": {
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": [
"build",
"lint",
"test",
"e2e"
],
"accessToken": "ZDcwMjZlOTUtNjQxMC00ZTgyLWI2MTAtNDY2NmQ2MTYzMGJifHJlYWQtd3JpdGU="
}
}
},
"workspaceLayout": {
"projectNameAndRootFormat": "as-provided"
},
"targetDefaults": {
"build": {
"dependsOn": [
"^build"
],
"inputs": [
"production",
"^production"
]
"dependsOn": ["^build"],
"inputs": ["production", "^production"],
"cache": true
},
"test": {
"inputs": [
"default",
"^production",
"{workspaceRoot}/jest.preset.js"
]
"inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"],
"cache": true
},
"e2e": {
"inputs": [
"default",
"^production"
]
"inputs": ["default", "^production"],
"cache": true
},
"lint": {
"inputs": [
"default",
"{workspaceRoot}/.eslintrc.json",
"{workspaceRoot}/.eslintignore",
"{workspaceRoot}/eslint.config.js"
]
],
"cache": true
}
},
"namedInputs": {
"default": [
"{projectRoot}/**/*",
"sharedGlobals"
],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
"production": [
"default",
"!{projectRoot}/**/?(*.)+(spec|test).[jt]s?(x)?(.snap)",
Expand All @@ -80,5 +55,6 @@
"@nx/angular:component": {
"style": "css"
}
}
},
"nxCloudAccessToken": "ZDcwMjZlOTUtNjQxMC00ZTgyLWI2MTAtNDY2NmQ2MTYzMGJifHJlYWQtd3JpdGU="
}
Loading

0 comments on commit eefe584

Please sign in to comment.