Skip to content

Commit

Permalink
Add CircleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
adrw committed Jun 26, 2019
1 parent 25ddde8 commit 2b40a54
Show file tree
Hide file tree
Showing 8 changed files with 128 additions and 50 deletions.
99 changes: 99 additions & 0 deletions .circleci/config.yml
@@ -0,0 +1,99 @@
version: 2.1
jobs:
compile_and_cache_java:
machine:
image: circleci/classic:latest
working_directory: ~/barber
environment:
ENVIRONMENT: TESTING
JVM_OPTS: -Xmx1024M
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=3 -Xmx4096m"
TERM: dumb
steps:
- checkout
- run:
name: "Download and extract OpenJDK 11"
command: |
mkdir -p ~/openjdk-11 && cd ~/openjdk-11 && curl -sSL https://download.oracle.com/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar -xz --strip-components 1
echo '
export PATH="$JAVA_HOME/bin:$PATH"
export JAVA_HOME="$HOME/openjdk-11"
' >> $BASH_ENV
- run:
name: "Compile"
command: |
./gradlew testClasses --parallel --build-cache
- save_cache:
paths:
- ~/.gradle/caches
- ~/.gradle/wrapper
# Under normal usage, saves compiled results from master once a day
key: v1-master-compile-{{ .BuildNum }}
java:
machine:
image: circleci/classic:latest
parallelism: 1
working_directory: ~/barber
environment:
ENVIRONMENT: TESTING
JVM_OPTS: -Xmx1024M
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.workers.max=3 -Xmx4096m"
TERM: dumb
steps:
- checkout # check out source code to working directory
- restore_cache:
keys:
# restore compilation and wrapper from previous branch/job build or master
- v1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Environment.CIRCLE_NODE_INDEX }}
- v1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}
- v1-master-compile
- run:
name: "Download and extract OpenJDK 11"
command: |
mkdir -p ~/openjdk-11 && cd ~/openjdk-11 && curl -sSL https://download.java.net/java/GA/jdk11/9/GPL/openjdk-11.0.2_linux-x64_bin.tar.gz | tar -xz --strip-components 1
echo '
export PATH="$JAVA_HOME/bin:$PATH"
export JAVA_HOME="$HOME/openjdk-11"
' >> $BASH_ENV
- run:
name: "Dump environment variables"
command: env
- run:
name: "Build and test"
command: ./gradlew build test -i --scan --parallel --build-cache
- run:
name: Collect test results
command: |
mkdir -p ~/test-results/junit/
find . -type f -regex ".*/build/test-results/.*xml" -exec cp {} ~/test-results/junit/ \;
when: always
- save_cache:
paths:
- ~/.gradle/caches
- ~/.gradle/wrapper
# Under normal usage, saves compiled results from master once a day
key: v1-{{ .Branch }}-{{ .Environment.CIRCLE_JOB }}-{{ .Environment.CIRCLE_NODE_INDEX }}-build-{{ .BuildNum }}
- store_test_results:
name: Store test results
path: ~/test-results
# TODO bring back "Collect gradle reports" and "Store gradle reports" tasks
workflows:
version: 2
on_commit:
jobs:
- compile_and_cache_java:
filters:
branches:
only: master
- java
nightly:
jobs:
- java
triggers:
- schedule:
# midnight mountain time in UTC
cron: "0 6 * * *"
filters:
branches:
only:
- master
3 changes: 0 additions & 3 deletions OWNERS.yaml

This file was deleted.

30 changes: 23 additions & 7 deletions build.gradle
@@ -1,29 +1,42 @@
buildscript {
repositories {
mavenCentral()
}
}

plugins {
id 'com.gradle.build-scan' version "2.1"
}

buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
}

ext {
isCi = "true".equals(System.getenv('CI'))
rep = null
}

apply from: new File("./dependencies.gradle")

subprojects {
apply plugin: "java"
buildscript {
repositories {
maven {
url "https://maven.global.square/artifactory/square-public"
}
mavenCentral()
jcenter()
}

dependencies {
classpath dep.kotlinGradlePlugin
classpath dep.wireCompiler
classpath dep.junitGradlePlugin
classpath dep.shadowJarPlugin
classpath dep.mavenPublishGradlePlugin
}
}

repositories {
maven {
url "https://maven.global.square/artifactory/square-public"
}
mavenCentral()
jcenter()
}
Expand All @@ -39,5 +52,8 @@ subprojects {
showExceptions = true
}
}
if (rootProject.file("hooks.gradle").exists()) {
apply from: rootProject.file("hooks.gradle")
}
}

2 changes: 0 additions & 2 deletions client/build.gradle
@@ -1,7 +1,6 @@
apply plugin: 'kotlin'
apply plugin: 'org.junit.platform.gradle.plugin'
apply plugin: 'com.github.johnrengelman.shadow'
apply from: "https://git.sqcorp.co/projects/CASH/repos/cash-upload/raw/common-upload.gradle?at=refs%2Fheads%2Fmaster"

compileKotlin {
kotlinOptions {
Expand Down Expand Up @@ -30,7 +29,6 @@ dependencies {
implementation dep.moshi
implementation dep.okio
implementation dep.mustacheCompiler
implementation dep.wireRuntime

testImplementation dep.assertj
testImplementation dep.kotlinTest
Expand Down
23 changes: 0 additions & 23 deletions dependencies.gradle
Expand Up @@ -8,10 +8,6 @@ ext.dep = [
"jacksonDataformatYaml": "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.3",
"jacksonJsr310": "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.4",
"jacksonKotlin": "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.3",
"jettyServer": "org.eclipse.jetty:jetty-server:9.4.18.v20190429",
"jettyServlet": "org.eclipse.jetty:jetty-servlet:9.4.18.v20190429",
"jettyWebsocketServer": "org.eclipse.jetty.websocket:websocket-server:9.4.18.v20190429",
"jettyWebsocketServlet": "org.eclipse.jetty.websocket:websocket-servlet:9.4.18.v20190429",
"junitApi": "org.junit.jupiter:junit-jupiter-api:5.3.1",
"junitEngine": "org.junit.jupiter:junit-jupiter-engine:5.3.1",
"junitGradlePlugin": "org.junit.platform:junit-platform-gradle-plugin:1.0.2",
Expand All @@ -23,29 +19,10 @@ ext.dep = [
"kotlinTest": "org.jetbrains.kotlin:kotlin-test:1.3.21",
"loggingApi": "io.github.microutils:kotlin-logging:1.4.9",
"mavenPublishGradlePlugin": "com.vanniktech:gradle-maven-publish-plugin:0.8.0",
"metricsCore": "io.dropwizard.metrics:metrics-core:4.0.1",
"metricsParent": "io.dropwizard.metrics:metrics-parent:4.0.1",
"misk": "com.squareup.misk:misk:2019.06.24-76501c30",
"miskTesting": "com.squareup.misk:misk-testing:2019.06.24-76501c30",
"mockito": "org.mockito:mockito-core:2.23.4",
"mockitoKotlin": "com.nhaarman:mockito-kotlin:1.5.0",
"moshi": "com.squareup.moshi:moshi-kotlin:1.8.0",
"mustacheCompiler": "com.github.spullara.mustache.java:compiler:0.9.5",
"mysql": "mysql:mysql-connector-java:8.0.16",
"okHttp": "com.squareup.okhttp3:okhttp:3.12.1",
"okio": "com.squareup.okio:okio:2.2.2",
"openTracing": "io.opentracing:opentracing-api:0.31.0",
"openTracingMock": "io.opentracing:opentracing-mock:0.31.0",
"openTracingOkHttp": "io.opentracing.contrib:opentracing-okhttp3:0.1.0",
"retrofit": "com.squareup.retrofit2:retrofit:2.4.0",
"retrofitMoshi": "com.squareup.retrofit2:converter-moshi:2.4.0",
"retrofitWire": "com.squareup.retrofit2:converter-wire:2.4.0",
"shadowJarPlugin": "com.github.jengelman.gradle.plugins:shadow:4.0.4",
"skim": "com.squareup.skim:skim:2019.06.23-1561270951-ecd8b13",
"tracingJaeger": "com.uber.jaeger:jaeger-core:0.24.0",
"wireCompiler": "com.squareup.wire:wire-compiler:3.0.0-square09",
"wireMoshiAdapter": "com.squareup.wire:wire-moshi-adapter:3.0.0-alpha01",
"wireRuntime": "com.squareup.wire:wire-runtime:3.0.0-alpha01",
"wireSchema": "com.squareup.wire:wire-schema:2.3.0-RC1",
]
// Auto-generated from polyrepo's master-dependencies.json. Update via polyrepo dep-add and polyrepo dep-upgrade.
12 changes: 6 additions & 6 deletions gradle.properties
Expand Up @@ -2,13 +2,13 @@ GROUP=com.squareup.barber
VERSION_NAME=


POM_URL=https://stash.corp.squareup.com/projects/CASH/repos/barber
POM_SCM_URL=https://stash.corp.squareup.com/projects/CASH/repos/barber/browse
POM_SCM_CONNECTION=scm:git:ssh://git@git.corp.squareup.com/cash/barber.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://git@git.corp.squareup.com/cash/barber.git
POM_URL=https://github.com/cashapp/barber/
POM_SCM_URL=https://github.com/cashapp/barber/
POM_SCM_CONNECTION=scm:git:git://github.com/cashapp/barber.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/cashapp/barber.git

POM_LICENCE_NAME=Private
POM_LICENCE_URL=Private
POM_LICENCE_NAME=The Apache Software License, Version 2.0
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=square
Expand Down
3 changes: 0 additions & 3 deletions kochiku.yml

This file was deleted.

6 changes: 0 additions & 6 deletions script/ci

This file was deleted.

0 comments on commit 2b40a54

Please sign in to comment.