summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Zschocke <florian.zschocke@devolo.de>2019-06-06 15:28:16 +0200
committerFlorian Zschocke <florian.zschocke@devolo.de>2019-06-07 12:57:25 +0200
commit845de9dbdd4a19ea7d4bd15d66fe9e22a16eae23 (patch)
tree3437033204cdefca45641cd42e74b32332b8472d
parenta13f07850fccfb67c14737f1e09942e31023da66 (diff)
downloadgitblit-845de9dbdd4a19ea7d4bd15d66fe9e22a16eae23.tar.gz
gitblit-845de9dbdd4a19ea7d4bd15d66fe9e22a16eae23.zip
Migrate to Circle CI version 2
The new Circle CI requires a completely different configuration.
-rw-r--r--.circleci/config.yml28
-rw-r--r--circle.yml22
2 files changed, 28 insertions, 22 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 00000000..605be704
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,28 @@
+version: 2
+
+jobs:
+ build:
+ docker:
+ - image: circleci/openjdk:8-jdk
+
+ steps:
+ - run:
+ name: Report on build environment
+ command: |
+ java -version
+ javac -version
+
+ - checkout
+ - run: ant
+
+ - run: ant test
+ - run:
+ name: Collect test results
+ command: |
+ mkdir -p test_reports/junit/
+ cp -a build/tests/TEST-*.xml test_reports/junit/
+ - store_test_results:
+ path: test_reports
+ - store_artifacts:
+ path: build/target/reports
+
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index fcf87867..00000000
--- a/circle.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-machine:
- java:
- version: openjdk7
-
-compile:
- pre:
- - java -version
- - javac -version
- override:
- - ant
-
-test:
- override:
- - ant test
- post:
- - mkdir -p $CIRCLE_TEST_REPORTS/junit/
- - cp -a build/tests/TEST-*.xml $CIRCLE_TEST_REPORTS/junit/
-
-general:
- artifacts:
- - "build/target/reports"
-