Skip to content

Commit 1be7110

Browse files
committed
separated builds into individual jobs
1 parent 1af13b1 commit 1be7110

File tree

9 files changed

+51
-37
lines changed

9 files changed

+51
-37
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ install:
1414
- haxelib git hxargs https://github.com/Simn/hxargs
1515
- haxelib install mcover 2.1.1
1616
script:
17-
- haxe build.hxml
17+
- haxe buildAll.hxml
1818

1919
after_success:
2020
- bash <(curl -s https://codecov.io/bash) || echo "Codecov did not collect coverage reports"

build.hxml

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
-cp src
2-
-cp test
3-
-lib haxeparser
4-
-lib compiletime:2.6.0
5-
-lib hxargs
6-
7-
--each
8-
1+
buildGlobal.hxml
92
-main checkstyle.Main
10-
-neko run.n
11-
12-
--next
13-
14-
-main checkstyle.Main
15-
-debug
16-
-neko runD.n
17-
18-
--next
19-
-lib mcover:2.1.1
20-
-D unittest
21-
-x TestMain
22-
--macro mcover.MCover.coverage(['checkstyle'], ['src'], ['checkstyle.reporter', 'checkstyle.Main'])
23-
24-
--next
25-
-cmd neko run -s src -s test -p resources/static-analysis.txt
26-
-cmd neko run --default-config resources/default-config.json
27-
-cmd neko run -c resources/default-config.json
3+
-neko run.n

buildAll.hxml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
build.hxml
2+
3+
--next
4+
5+
buildDebug.hxml
6+
7+
--next
8+
9+
buildTest.hxml

buildDebug.hxml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
buildGlobal.hxml
2+
-main checkstyle.Main
3+
-debug
4+
-neko runD.n
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
-cp src
22
-cp test
3+
-cp resources
34
-lib haxeparser
45
-lib compiletime:2.6.0
5-
-lib hxargs
6-
-main checkstyle.Main
7-
-neko run.n
6+
-lib hxargs

buildTelemetry.hxml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
-cp resources
2-
-cp src
3-
-lib haxeparser
4-
-lib compiletime
5-
-lib hxargs
1+
buildGlobal.hxml
62
-lib hxtelemetry
73

84
--each

buildTest.hxml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
buildGlobal.hxml
2+
-lib mcover:2.1.1
3+
-D unittest
4+
-x TestMain
5+
--macro mcover.MCover.coverage(['checkstyle'], ['src'], ['checkstyle.reporter', 'checkstyle.Main'])
6+
7+
--next
8+
-cmd neko run -s src -s test -p resources/static-analysis.txt
9+
-cmd neko run --default-config resources/default-config.json
10+
-cmd neko run -c resources/default-config.json

gruntfile.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,20 @@ module.exports = function (grunt) {
1313
},
1414

1515
haxe: {
16-
project: {
16+
all: {
17+
hxml: "buildAll.hxml"
18+
},
19+
build: {
1720
hxml: "build.hxml"
21+
},
22+
test: {
23+
hxml: "buildTest.hxml"
24+
},
25+
debug: {
26+
hxml: "buildDebug.hxml"
27+
},
28+
telemetry: {
29+
hxml: "buildTelemetry.hxml"
1830
}
1931
},
2032

@@ -26,5 +38,5 @@ module.exports = function (grunt) {
2638
grunt.loadNpmTasks("grunt-haxe");
2739
grunt.loadNpmTasks("grunt-zip");
2840
grunt.loadNpmTasks("grunt-shell");
29-
grunt.registerTask("default", ["shell", "haxe"]);
41+
grunt.registerTask("default", ["shell", "haxe:all"]);
3042
};

test/checks/whitespace/SpacingCheckTest.hx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ class SpacingCheckTest extends CheckTestCase<SpacingCheckTests> {
2626
assertMsg(new SpacingCheck(), TEST3, 'Space around "++"');
2727
}
2828

29+
public function testRangeOperator() {
30+
var check = new SpacingCheck();
31+
assertNoMsg(check, TEST4B);
32+
33+
check.ignoreRangeOperator = false;
34+
assertMsg(check, TEST4B, 'No space around "..."');
35+
}
36+
2937
public function testForShouldContainSpace() {
3038
assertMsg(new SpacingCheck(), TEST4A, 'No space between "for" and "("');
3139
assertNoMsg(new SpacingCheck(), TEST4B);

0 commit comments

Comments
 (0)