Skip to content

Commit f70d4b0

Browse files
committed
Merge branch 'release/1-0-0'
2 parents 2a5ad85 + 9e12568 commit f70d4b0

File tree

447 files changed

+15905
-5273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

447 files changed

+15905
-5273
lines changed

.gitignore

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
*.7z
2+
*.dmg
3+
*.gz
4+
*.iso
5+
*.jar
6+
*.rar
7+
*.tar
8+
*.zip
9+
*.war
10+
*.ear
11+
*.sar
12+
*.class
13+
14+
target/
15+
16+
*.iml
17+
*.iws
18+
*.ipr
19+
.idea/
20+
21+
.gradle/
22+
23+
build/
24+
25+
# ignore "out" directories from root to subprojects (e.g. /apps/test-classes/out/)
26+
/out/
27+
/*/out/
28+
/*/*/out/
29+
30+
.DS_Store
31+
32+
*.swp
33+
release.properties
34+

.gitlab-ci.yml

Lines changed: 50 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,58 @@
1-
# Only one runner
2-
variables:
3-
JAVA_HOME: "/usr/lib/jvm/java-7-openjdk-amd64/"
1+
image: openjdk:10-jdk-slim
42

5-
# default build
6-
jbotsim:
3+
before_script:
4+
- export GRADLE_USER_HOME=`pwd`/.gradle
5+
- chmod +x ./gradlew
6+
7+
cache:
8+
paths:
9+
- .gradle/wrapper
10+
11+
stages:
12+
- build
13+
- test
14+
- publish
15+
16+
assemble-jar:
717
stage: build
818
tags:
9-
- ubuntu1404
19+
- docker
1020
script:
11-
- $JAVA_HOME/bin/java -version
12-
- cd src && make
21+
- java -version
22+
- ./gradlew lib:cleans lib:jars
1323
artifacts:
1424
paths:
15-
- src/jbotsim.jar
25+
- lib/jbotsim-core/build/libs
26+
- lib/jbotsim-extras-common/build/libs
27+
- lib/jbotsim-extras-swing/build/libs
28+
- lib/jbotsim-icons/build/libs
29+
- lib/jbotsim-ui-common/build/libs
30+
- lib/jbotsim-ui-swing/build/libs
31+
- lib/jbotsim-serialization-common/build/libs
1632
name: jbotsim
1733

34+
run-unit-tests:
35+
stage: test
36+
tags:
37+
- docker
38+
script:
39+
- java -version
40+
- ./gradlew lib:cleans lib:tests
41+
artifacts:
42+
paths:
43+
- lib/jbotsim-core/build/test-results
44+
- lib/jbotsim-extras-common/build/test-results
45+
- lib/jbotsim-extras-swing/build/test-results
46+
- lib/jbotsim-icons/build/test-results
47+
- lib/jbotsim-ui-common/build/test-results
48+
- lib/jbotsim-ui-swing/build/test-results
49+
- lib/jbotsim-serialization-common/build/test-results
50+
- lib/jbotsim-core/build/reports
51+
- lib/jbotsim-extras-common/build/reports
52+
- lib/jbotsim-extras-swing/build/reports
53+
- lib/jbotsim-icons/build/reports
54+
- lib/jbotsim-ui-common/build/reports
55+
- lib/jbotsim-ui-swing/build/reports
56+
- lib/jbotsim-serialization-common/build/reports
57+
name: tests
58+

.idea/copyright/JBotSim.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: java
2-
script: cd src && make
2+
script: ./gradlew lib:cleans lib:jars lib:tests
33
jdk:
44
- openjdk8
55
- oraclejdk8

0 commit comments

Comments
 (0)