Merge branch 'master' into calcinttype_int_to_long

kaitai-io · Feb 14, 2018 · e0f79f3 · e0f79f3
2 parents 347ec68 + 933c246
commit e0f79f3
Show file tree

Hide file tree

Showing 106 changed files with 6,989 additions and 2,212 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -0,0 +1,37 @@
+version: 2
+defaults: &defaults
+  working_directory: ~/repo
+  docker:
+    - image: circleci/openjdk:8-jdk
+  environment:
+    JVM_OPTS: -Xmx3200m
+    TERM: dumb
+jobs:
+  build:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "build.sbt" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+      - run: cat /dev/null | sbt compilerJVM/universal:packageBin
+      - store_artifacts:
+          path: jvm/target/universal/kaitai-struct-compiler-*.zip
+      - save_cache:
+          paths:
+            - ~/.m2
+          key: v1-dependencies--{{ checksum "build.sbt" }}
+  test:
+    <<: *defaults
+    steps:
+      - run: cat /dev/null | sbt compilerJVM/test
+workflows:
+  version: 2
+  build_test_deploy:
+    jobs:
+      - build
+      - test:
+          requires:
+            - build
diff --git a/.gitignore b/.gitignore
@@ -54,3 +54,4 @@ project/boot/
 
 # Unpacking complete binaries for testing purposes
 /runnable
+js/npm
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/hydra.xml b/.idea/hydra.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/compiler-sources.iml b/.idea/modules/compiler-sources.iml
Original file line number	Diff line number	Diff line change
Expand Up		@@ -54,3 +54,4 @@ project/boot/

		# Unpacking complete binaries for testing purposes
		/runnable
		js/npm