Skip to content

Commit

Permalink
ci: ignore js files in unittests (frappe#26937)
Browse files Browse the repository at this point in the history
* ci: ignore js files in unittests (frappe#26934)

* ci: ignore js files in unittests

- Avoid running python unittests on PRs that ONLY change JS files.

* ci: ignore md files in test workflows

(cherry picked from commit 8a6b82b)

# Conflicts:
#	.github/workflows/server-tests.yml

* fix: resolve conflicts

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
  • Loading branch information
2 people authored and sagarvora committed Oct 2, 2021
1 parent 6510114 commit 6192bf3
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 17 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
- '**.md'
workflow_dispatch:

concurrency:
group: patch-develop-${{ github.event.number }}
cancel-in-progress: true

jobs:
test:
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/server-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ on:
- '**.js'
- '**.md'

concurrency:
group: server-develop-${{ github.event.number }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -870,16 +870,12 @@
"idx": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-09-01 16:04:03.538643",
=======
"modified": "2021-08-12 20:14:45.506639",
>>>>>>> fix: Deferred Revenue Section should be collapsible only if its not enabled (#26930)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -833,16 +833,12 @@
"idx": 1,
"istable": 1,
"links": [],
<<<<<<< HEAD
"modified": "2021-08-19 13:41:53.435827",
=======
"modified": "2021-08-12 20:15:42.668399",
>>>>>>> fix: Deferred Revenue Section should be collapsible only if its not enabled (#26930)
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
"owner": "Administrator",
"permissions": [],
"sort_field": "modified",
"sort_order": "DESC"
}
}

0 comments on commit 6192bf3

Please sign in to comment.