aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Christopher Vogt <oss.nsp@cvogt.org>2017-06-15 23:42:27 -0400
committerGitHub <noreply@github.com>2017-06-15 23:42:27 -0400
commitc8e56f1d45a31d9653fb69829cfac832143526c6 (patch)
treebc41d15ef4d2d8c9f9d0854ab98f4bb227b448b0
parent494c302e738529ff2113d25910398d7b2b7a196c (diff)
parentcd16b641cf34d32ab948bd5fa18f75c75e8ed14d (diff)
downloadcbt-c8e56f1d45a31d9653fb69829cfac832143526c6.tar.gz
cbt-c8e56f1d45a31d9653fb69829cfac832143526c6.tar.bz2
cbt-c8e56f1d45a31d9653fb69829cfac832143526c6.zip
Merge pull request #524 from cvogt/circle-2.0
upgrade to circleci 2.0
-rw-r--r--.circleci/config.yml50
-rw-r--r--circle.yml40
2 files changed, 50 insertions, 40 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000..b1a82d8
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,50 @@
+version: 2
+jobs:
+ build:
+ working_directory: ~/cbt
+ docker:
+ - image: circleci/java:8-jdk
+ steps:
+ - checkout
+ - restore_cache:
+ key: dependency-cache
+ - run:
+ command: 'mkdir -p ~/cache'
+ - run:
+ command: 'rm ~/.gitconfig || true' # avoid url replacement breaking jgit
+ - run:
+ command: 'wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nailgun/nailgun_0.9.0+trunk95-3_amd64.deb --continue -O ~/cache/nailgun_0.9.0+trunk95-3_amd64.deb'
+ - run:
+ command: 'sudo dpkg -i ~/cache/nailgun_0.9.0+trunk95-3_amd64.deb'
+ - run:
+ command: 'wget http://mirrors.kernel.org/ubuntu/pool/universe/s/shellcheck/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb --continue -O ~/cache/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb'
+ - run:
+ command: 'sudo dpkg -i ~/cache/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb'
+ - save_cache:
+ key: dependency-cache
+ paths:
+ - "~/cache"
+ - run:
+ command: './cbt direct compile'
+ - run:
+ command: './cbt direct test.compile'
+ - run:
+ command: './cbt compile'
+ - run:
+ command: './cbt -Dlog=all'
+ - run:
+ command: 'git diff --exit-code'
+ - run:
+ command: './cbt direct test.run slow fork direct'
+ - run:
+ command: './cbt direct test.run slow fork'
+ - run:
+ command: './cbt direct test.run slow'
+ - run:
+ command: './cbt test.run slow fork direct'
+ - run:
+ command: './cbt test.run slow fork'
+ - run:
+ command: './cbt test.run slow'
+ - run:
+ command: 'git diff --exit-code'
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index 08d9182..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-machine:
- java:
- version: oraclejdk8
-
-dependencies:
- cache_directories:
- - "~/cache"
- override:
- - mkdir -p ~/cache
- - wget http://mirrors.kernel.org/ubuntu/pool/universe/n/nailgun/nailgun_0.9.0+trunk95-3_amd64.deb --continue -O ~/cache/nailgun_0.9.0+trunk95-3_amd64.deb
- - sudo dpkg -i ~/cache/nailgun_0.9.0+trunk95-3_amd64.deb
- - wget http://mirrors.kernel.org/ubuntu/pool/universe/s/shellcheck/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb --continue -O ~/cache/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb
- - sudo dpkg -i ~/cache/shellcheck_0.3.3-1~ubuntu14.04.1_amd64.deb
-
-compile:
- override:
- - rm ~/.gitconfig # avoid url replacement breaking jgit
- - ./cbt direct compile
- - ./cbt direct test.compile
- - ./cbt compile
- - ./cbt -Dlog=all
- - git diff --exit-code
-
-test:
- override:
- - ./cbt direct test.run slow:
- timeout: 1800
- - ./cbt direct test.run slow:
- timeout: 1800
- - ./cbt direct test.run slow fork:
- timeout: 1800
- - ./cbt direct test.run slow fork direct:
- timeout: 1800
- - ./cbt test.run slow:
- timeout: 1800
- - ./cbt test.run slow fork:
- timeout: 1800
- - ./cbt test.run slow fork direct:
- timeout: 1800
- - git diff --exit-code