From 0f35d1e2f9af1e7a9dfefbf6cf798ac2d0732ffb Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 16 May 2018 23:42:07 -0700 Subject: [PATCH 1/8] convert circleci configuration to version 2.0 --- .circleci/config.yml | 36 ++++++++++++++++++++++++++++++++++++ circle.yml | 23 ----------------------- 2 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 circle.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 000000000..077f35c82 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,36 @@ +version: 2 + +jobs: + build: + docker: + - image: circleci/openjdk:8-jdk + + working_directory: ~/AntennaPod + + environment: + GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' + _JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m" + + steps: + - checkout + + - restore_cache: + keys: + - v1-android-{{ checksum "build.gradle" }} + # fallback to using the latest cache if no exact match is found + - v1-android- + + - run: echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-26" + - run: echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3" + + - run: ./gradlew assembleDebug -PdisablePreDex + no_output_timeout: 1800 + + - store_artifacts: + - app/build/outputs/apk + + - save_cache: + paths: + - ~/.android + - ~/android + key: v1-android-{{ checksum "build.gradle" }} diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 52ce389d4..000000000 --- a/circle.yml +++ /dev/null @@ -1,23 +0,0 @@ -general: - artifacts: - - app/build/outputs/apk -machine: - environment: - GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' - _JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m" - java: - version: oraclejdk8 -dependencies: - cache_directories: - - ~/.android - - ~/android - pre: - - echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-26" - - echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3" - override: - - echo override dependencies - -test: - override: - - ./gradlew assembleDebug -PdisablePreDex: - timeout: 1800 From 8a3f1481be33e428751136808500b09795664bf6 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 16 May 2018 23:43:46 -0700 Subject: [PATCH 2/8] fix syntax error in circleci config --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 077f35c82..a2addb759 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,8 @@ jobs: - run: echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-26" - run: echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3" - - run: ./gradlew assembleDebug -PdisablePreDex + - run: + command: ./gradlew assembleDebug -PdisablePreDex no_output_timeout: 1800 - store_artifacts: From a540eef46d50f7c2f507da785a254b6961046862 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 16 May 2018 23:45:57 -0700 Subject: [PATCH 3/8] fix syntax error in circleci config store_artifacts step --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a2addb759..3406a6617 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: no_output_timeout: 1800 - store_artifacts: - - app/build/outputs/apk + path: app/build/outputs/apk - save_cache: paths: From d613ae721342930d49caa12d609d28cf7e535f94 Mon Sep 17 00:00:00 2001 From: brad Date: Wed, 16 May 2018 23:50:39 -0700 Subject: [PATCH 4/8] use circleci/android:api-26-alpha docker image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3406a6617..7d26418db 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 jobs: build: docker: - - image: circleci/openjdk:8-jdk + - image: circleci/android:api-26-alpha working_directory: ~/AntennaPod From 9ec56e7a41f28fe904ea25bf735fcc515f96c66c Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 17 May 2018 00:06:24 -0700 Subject: [PATCH 5/8] remove unnecessary steps installing sdk components --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7d26418db..726e2f03d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,9 +20,6 @@ jobs: # fallback to using the latest cache if no exact match is found - v1-android- - - run: echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-26" - - run: echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3" - - run: command: ./gradlew assembleDebug -PdisablePreDex no_output_timeout: 1800 From d6d01c5c4f62eb2ae5f32e4358388a07863d0f52 Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 17 May 2018 00:06:42 -0700 Subject: [PATCH 6/8] also cache .gradle --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 726e2f03d..f13513e0a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,5 +30,6 @@ jobs: - save_cache: paths: - ~/.android + - ~/.gradle - ~/android key: v1-android-{{ checksum "build.gradle" }} From ee1c7f734e84ae9b8ef34a6bbd5c892e49398bfc Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 17 May 2018 00:11:10 -0700 Subject: [PATCH 7/8] specify destination artifact path to avoid excessive nesting --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index f13513e0a..7c8de450f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ jobs: - store_artifacts: path: app/build/outputs/apk + destination: apks - save_cache: paths: From 9a88daf1295839ceea02c7407d584d6ee4856b4d Mon Sep 17 00:00:00 2001 From: brad Date: Thu, 17 May 2018 00:13:08 -0700 Subject: [PATCH 8/8] stop using unsupported MaxPermSize=350m param Gets rid of this warning: OpenJDK 64-Bit Server VM warning: ignoring option MaxPermSize=350m; support was removed in 8.0 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c8de450f..256b3b882 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,7 +9,7 @@ jobs: environment: GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"' - _JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m" + _JAVA_OPTIONS: "-Xms256m -Xmx1280m" steps: - checkout