diff --git a/.circleci/config.yml b/.circleci/config.yml index e57a75a..0e6702e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 jobs: - build: + check: docker: - image: cimg/openjdk:11.0 resource_class: large @@ -53,7 +53,7 @@ jobs: - store_artifacts: path: ~/assets-cache - deploy: + publish: docker: - image: cimg/openjdk:11.0 steps: @@ -64,7 +64,7 @@ jobs: command: | ./gradlew --stacktrace publish - deploy_sandbox: + trial-publish: docker: - image: cimg/openjdk:11.0 steps: @@ -79,18 +79,13 @@ workflows: version: 2 build-and-deploy: jobs: - - build - - deploy_sandbox: - requires: - - build - filters: - branches: - only: - - develop - - deploy: - requires: - - build - filters: - branches: - only: - - release + - check: + filters: { tags: { only: /.*/ } } + + - trial-publish: + requires: [ check ] + filters: { branches: { ignore: develop } } + + - publish: + requires: [ check, trial-publish ] + filters: { tags: { only: /.*/ }, branches: { only: develop } } diff --git a/.circleci/template.sh b/.circleci/template.sh new file mode 100644 index 0000000..e80105b --- /dev/null +++ b/.circleci/template.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +export CIRCLECI_TEMPLATE=java-library-oss +export JDK=11 diff --git a/build.gradle b/build.gradle index 9e95b48..fbb548c 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,6 @@ buildscript { dependencies { classpath 'com.palantir.baseline:gradle-baseline-java:5.31.0' - classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.12.0' classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.39.0' classpath 'gradle.plugin.org.inferred:gradle-processors:3.7.0' } @@ -16,6 +15,7 @@ plugins { id 'java' id 'com.github.ben-manes.versions' version '0.50.0' id 'com.palantir.git-version' version '3.0.0' + id 'com.palantir.external-publish' version '1.12.0' } allprojects { @@ -27,7 +27,6 @@ apply plugin: 'com.palantir.baseline-config' apply plugin: 'com.palantir.baseline-checkstyle' apply plugin: 'com.palantir.baseline-error-prone' apply plugin: 'com.palantir.baseline-idea' -apply plugin: 'com.palantir.external-publish' apply plugin: 'com.palantir.external-publish-jar' sourceCompatibility = JavaVersion.VERSION_11