Browse Source

Merge pull request #536 from ShaneMcC/master

Minor changes for circle.
master
Shane Mc Cormack 3 years ago
parent
commit
f42d84a041
No account linked to committer's email address
1 changed files with 18 additions and 10 deletions
  1. 18
    10
      .circleci/config.yml

+ 18
- 10
.circleci/config.yml View File

12
     steps:
12
     steps:
13
       - run: git clone https://github.com/DMDirc/Meta.git .
13
       - run: git clone https://github.com/DMDirc/Meta.git .
14
       - run: git submodule update --init --remote
14
       - run: git submodule update --init --remote
15
-      - run: |
16
-          cd plugins
17
-          git remote set-url origin https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git:
18
-          if [ -n "$CIRCLE_PR_NUMBER" ]; then
19
-              git fetch origin pull/$CIRCLE_PR_NUMBER/head:circleci;
20
-          else
21
-              git fetch origin $CIRCLE_BRANCH:circleci;
22
-          fi
23
-      - run: cd plugins && git fetch --tags
24
-      - run: cd plugins && git checkout circleci
15
+      - run:
16
+          working_directory: plugins
17
+          command: |
18
+            git remote set-url origin https://github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME.git
19
+            if [ -n "$CIRCLE_PR_NUMBER" ]; then
20
+                git fetch origin pull/$CIRCLE_PR_NUMBER/head:circleci;
21
+            else
22
+                git fetch origin $CIRCLE_BRANCH:circleci;
23
+            fi
24
+      - run:
25
+          working_directory: plugins
26
+          command: git fetch --tags
27
+      - run:
28
+          working_directory: plugins
29
+          command: git checkout circleci
25
       - run: ./gradlew dependencies
30
       - run: ./gradlew dependencies
26
       - run: ./gradlew --stacktrace plugins:jars plugins:tests plugins:coveralls
31
       - run: ./gradlew --stacktrace plugins:jars plugins:tests plugins:coveralls
27
       - save_cache:
32
       - save_cache:
34
           key: v1-gradle-cache-{{ checksum "build.gradle" }}
39
           key: v1-gradle-cache-{{ checksum "build.gradle" }}
35
       - run:
40
       - run:
36
           name: Prepare test output
41
           name: Prepare test output
42
+          when: always
37
           command: |
43
           command: |
38
             mkdir -p ~/test-results/junit/
44
             mkdir -p ~/test-results/junit/
39
             find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
45
             find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
40
       - store_test_results:
46
       - store_test_results:
47
+          when: always
41
           path: ~/test-results
48
           path: ~/test-results
42
       - store_artifacts:
49
       - store_artifacts:
50
+          when: always
43
           path: ~/test-results/junit
51
           path: ~/test-results/junit
44
       - store_artifacts:
52
       - store_artifacts:
45
           path: plugins/dist
53
           path: plugins/dist

Loading…
Cancel
Save