Skip to content

Commit

Permalink
Updated CircleCI files
Browse files Browse the repository at this point in the history
  • Loading branch information
wakaleo committed Jun 18, 2018
1 parent 06ef2be commit cb36459
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 62 deletions.
27 changes: 11 additions & 16 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,12 @@ jobs:
key: v1-dependencies-{{ checksum "build.gradle" }}

# run tests!
- run:
- gradle test
- run: gradle test

test:
post:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
# test:
# post:
# - mkdir -p $CIRCLE_TEST_REPORTS/junit/
# - find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

integration_tests:
docker:
Expand Down Expand Up @@ -80,20 +79,16 @@ jobs:
key: v1-dependencies-{{ checksum "build.gradle" }}

# run tests!
- run:
- gradle integrationTests
- gradle browserTests
- run: gradle integrationTests
- run: gradle browserTests

test:
post:
- mkdir -p $CIRCLE_TEST_REPORTS/junit/
- find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
# test:
# post: mkdir -p $CIRCLE_TEST_REPORTS/junit/
# post: find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;

workflows:
version: 2
build_pipeline:
jobs:
- unit_tests
- integration_tests:
requires:
- unit_tests
- integration_tests
46 changes: 0 additions & 46 deletions circleci.yml

This file was deleted.

0 comments on commit cb36459

Please sign in to comment.