Browse Source

CircleCI Updates Hopefully.

pull/167/head
Shane Mc Cormack 3 years ago
parent
commit
f10ce5775d
3 changed files with 82 additions and 28 deletions
  1. 66
    0
      .circleci/config.yml
  2. 16
    1
      build.gradle
  3. 0
    27
      circle.yml

+ 66
- 0
.circleci/config.yml View File

@@ -0,0 +1,66 @@
1
+---
2
+version: 2
3
+
4
+jobs:
5
+  build:
6
+    environment:
7
+      TERM: dumb
8
+      _JAVA_OPTIONS: "-Xmx3g"
9
+      GRADLE_OPTS: "-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
10
+    docker: # run the steps with Docker
11
+      - image: circleci/openjdk:8-jdk
12
+    steps:
13
+      - checkout
14
+      - restore_cache:
15
+          key: v1-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
16
+      - restore_cache:
17
+          key: v1-gradle-cache-{{ checksum "build.gradle" }}
18
+      - run: if [ -e .git/shallow ]; then git fetch --unshallow; fi
19
+      - run: git fetch --tags
20
+      - run: git submodule update --init --remote
21
+      - run: ./gradlew dependencies
22
+      - run: ./gradlew test jacocoTestReport coveralls
23
+      - save_cache:
24
+          paths:
25
+            - ~/.gradle/wrapper
26
+          key: v1-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
27
+      - save_cache:
28
+          paths:
29
+            - ~/.gradle/caches
30
+          key: v1-gradle-cache-{{ checksum "build.gradle" }}
31
+      - run:
32
+          name: Prepare test output
33
+          command: |
34
+            mkdir -p ~/test-results/junit/
35
+            find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
36
+      - store_test_results:
37
+          path: ~/test-results
38
+      - store_artifacts:
39
+          path: ~/test-results/junit
40
+      - persist_to_workspace:
41
+          root: .
42
+          paths:
43
+            - .
44
+  publishSnapshot:
45
+    environment:
46
+      TERM: dumb
47
+      _JAVA_OPTIONS: "-Xmx3g"
48
+      GRADLE_OPTS: "-Xmx2g -Dorg.gradle.daemon=false -Dorg.gradle.workers.max=2"
49
+    docker:
50
+      - image: circleci/openjdk:8-jdk
51
+    steps:
52
+      - attach_workspace:
53
+          at: .
54
+      - run: ./gradlew publishSnapshot
55
+
56
+workflows:
57
+  version: 2
58
+  build_and_publish:
59
+    jobs:
60
+      - build
61
+      - publishSnapshot:
62
+          filters:
63
+            branches:
64
+              only: master
65
+          requires:
66
+            - build

+ 16
- 1
build.gradle View File

@@ -85,6 +85,21 @@ subprojects {
85 85
                     password = project.findProperty("gpr.key") ?: System.getenv("PASSWORD")
86 86
                 }
87 87
             }
88
+            maven {
89
+                name = "Reposilite"
90
+                if (project.version.endsWith('-SNAPSHOT')) {
91
+                    url = uri("https://artifactory.dmdirc.com/snapshots")
92
+                } else {
93
+                    url = uri("https://artifactory.dmdirc.com/releases")
94
+                }
95
+                credentials {
96
+                    username = project.findProperty("reposiliteUser") ?: System.getenv('REPOSILITE_USER')
97
+                    password = project.findProperty("reposiliteToken") ?:  System.getenv('REPOSILITE_TOKEN')
98
+                }
99
+                authentication {
100
+                    basic(BasicAuthentication)
101
+                }
102
+            }
88 103
         }
89 104
     }
90 105
 
@@ -112,7 +127,7 @@ subprojects {
112 127
         testCompile group: 'org.mockito', name: 'mockito-core', version: '2.2.7'
113 128
     }
114 129
 
115
-    task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToSnapshotsRepository') << {
130
+    task publishSnapshot(dependsOn: 'publishMavenJavaPublicationToReposiliteRepository') << {
116 131
     }
117 132
 
118 133
     task javadocJar(type: Jar) {

+ 0
- 27
circle.yml View File

@@ -1,27 +0,0 @@
1
----
2
-
3
-machine:
4
-  java:
5
-    version: oraclejdk8
6
-  environment:
7
-    TERM: dumb
8
-
9
-checkout:
10
-  post:
11
-    - "if [ -e .git/shallow ]; then git fetch --unshallow; fi"
12
-    - git fetch --tags
13
-
14
-dependencies:
15
-  override:
16
-    - ./gradlew dependencies
17
-
18
-test:
19
-  override:
20
-    - ./gradlew test jacocoTestReport coveralls
21
-
22
-deployment:
23
-  snapshots:
24
-    branch: master
25
-    owner: DMDirc
26
-    commands:
27
-      - ./gradlew publishSnapshot

Loading…
Cancel
Save