test (circle / travis): test configuration

dasch-swiss · Sep 6, 2018 · 5053387 · 5053387
1 parent fea1ad6
commit 5053387
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 42 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,49 +6,48 @@ version: 2
 general:
   branches:
     ignore:
-      - gh-pages
+    - gh-pages
 jobs:
   build:
     docker:
-      - image: angular/ngcontainer:latest
+    - image: angular/ngcontainer:latest
     working_directory: ~/repo
 
     steps:
-      - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "yarn.lock" }}
-
-      - run:
-          name: Version Info
-          command: |
-            node --version \
-              && yarn --version \
-              && git --version
-
-      - run: yarn install
-
-      - save_cache:
-          paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "yarn.lock" }}
-
-      # Build the libraries
-      - run: yarn build-lib
-
-      # Build the demo app
-      # - run: yarn build:app
-
-      # Run unit tests!
-      # - run: xvfb-run -a yarn ci:test
-      - run: yarn ng t --project @knora/core --watch=false --browsers=ChromeHeadless
-
-      # Run e2e tests!
-      # - run: xvfb-run -a yarn ci:e2e
-
-      # Store build artefacts on circle
-      - store_artifacts:
-          path: ~/repo/dist
-          destination: dist
+    - checkout
+
+    # Download and cache dependencies
+    - restore_cache:
+        keys:
+        - v1-dependencies-{{ checksum "yarn.lock" }}
+
+    - run:
+        name: Version Info
+        command: |
+          node --version \
+            && yarn --version \
+            && git --version
+    - run: yarn install
+
+    - save_cache:
+        paths:
+        - node_modules
+        key: v1-dependencies-{{ checksum "yarn.lock" }}
+
+    # Build the libraries
+    - run: yarn build-lib
+
+    # Build the demo app
+    # - run: yarn build:app
+
+    # Run unit tests!
+    # - run: xvfb-run -a yarn ci:test
+    - run: yarn ng t --project @knora/core --watch=false --browsers=ChromeHeadless
+
+    # Run e2e tests!
+    # - run: xvfb-run -a yarn ci:e2e
+
+    # Store build artefacts on circle
+    - store_artifacts:
+        path: ~/repo/dist
+        destination: dist
diff --git a/.editorconfig b/.editorconfig
@@ -12,6 +12,10 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 2
 
+[*.yml]
+indent_style = space
+indent_size = 2
+
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false

diff --git a/.travis.yml b/.travis.yml
@@ -15,9 +15,9 @@ addons:
   chrome: stable
   apt:
     sources:
-    - ubuntu-toolchain-r-test
+      - ubuntu-toolchain-r-test
     packages:
-    - g++-4.9
+      - g++-4.9
 
 env:
   global: