Merge branch 'main' into 3.99
This commit is contained in:
@@ -105,6 +105,8 @@ workflows:
|
|||||||
branches:
|
branches:
|
||||||
only:
|
only:
|
||||||
- main
|
- main
|
||||||
|
- "3.99"
|
||||||
|
- "4.0"
|
||||||
jobs:
|
jobs:
|
||||||
- build:
|
- build:
|
||||||
executor: node14
|
executor: node14
|
||||||
@@ -134,7 +136,7 @@ workflows:
|
|||||||
- build_node_14
|
- build_node_14
|
||||||
filters:
|
filters:
|
||||||
branches:
|
branches:
|
||||||
only: main
|
ignore: /pull\/.*/ # Don't run on pull requests.
|
||||||
push:
|
push:
|
||||||
jobs:
|
jobs:
|
||||||
- build:
|
- build:
|
||||||
@@ -161,3 +163,9 @@ workflows:
|
|||||||
name: test_node_10
|
name: test_node_10
|
||||||
requires:
|
requires:
|
||||||
- build_node_10
|
- build_node_10
|
||||||
|
- test_browsers:
|
||||||
|
requires:
|
||||||
|
- build_node_14
|
||||||
|
filters:
|
||||||
|
branches:
|
||||||
|
ignore: /pull\/.*/ # Don't run on pull requests.
|
||||||
|
|||||||
Reference in New Issue
Block a user