From 7e5c0b34b583283c28a42281d46a23cbbfa288b7 Mon Sep 17 00:00:00 2001
From: Ned Twigg <ned.twigg@diffplug.com>
Date: Tue, 22 Sep 2020 21:47:36 -0700
Subject: [PATCH] Add release buttons only for the ones that don't need p2.

---
 .circleci/config.yml | 60 +++-----------------------------------------
 settings.gradle      | 14 +++++++++--
 2 files changed, 16 insertions(+), 58 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 71e88b0f92..ab30f4e843 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,8 +210,8 @@ jobs:
       - *restore_cache_deps
       - *set_git_origin_to_https
       - run:
-          name: gradlew -Pcom.diffplug.spotless.include.ext=true changelogPrint
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true changelogPrint
+          name: gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
+          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true changelogPrint
   ext_do_release_base:
     << : *env_gradle
     steps:
@@ -221,7 +221,7 @@ jobs:
       - *set_git_origin_to_https
       - run:
           name: gradlew :eclipse-base:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true :eclipse-base:changelogPush -Prelease=true --stacktrace
+          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-base:changelogPush -Prelease=true --stacktrace
   ext_do_release_jdt:
     << : *env_gradle
     steps:
@@ -231,38 +231,7 @@ jobs:
       - *set_git_origin_to_https
       - run:
           name: gradlew :eclipse-jdt:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true :eclipse-jdt:changelogPush -Prelease=true --stacktrace
-  ext_do_release_wtp:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-wtp:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true :eclipse-wtp:changelogPush -Prelease=true --stacktrace
-  ext_do_release_cdt:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-cdt:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true :eclipse-cdt:changelogPush -Prelease=true --stacktrace
-  ext_do_release_groovy:
-    << : *env_gradle
-    steps:
-      - checkout
-      - *restore_cache_wrapper
-      - *restore_cache_deps
-      - *set_git_origin_to_https
-      - run:
-          name: gradlew :eclipse-groovy:changelogPush
-          command: ./gradlew -Pcom.diffplug.spotless.include.ext=true :eclipse-groovy:changelogPush -Prelease=true --stacktrace
-
+          command: ./gradlew -Pcom.diffplug.spotless.include.ext.nop2=true :eclipse-jdt:changelogPush -Prelease=true --stacktrace
 workflows:
   version: 2
   assemble_and_test:
@@ -338,24 +307,3 @@ workflows:
       - ext_do_release_jdt:
           requires:
             - ext_release_jdt
-      - ext_release_wtp:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_wtp:
-          requires:
-            - ext_release_wtp
-      - ext_release_cdt:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_cdt:
-          requires:
-            - ext_release_cdt
-      - ext_release_groovy:
-          type: approval
-          requires:
-            - ext_changelog_print
-      - ext_do_release_groovy:
-          requires:
-            - ext_release_groovy
diff --git a/settings.gradle b/settings.gradle
index 670f24ef36..6842acda61 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -50,7 +50,7 @@ if (org.gradle.api.JavaVersion.current() == org.gradle.api.JavaVersion.VERSION_1
 }
 
 def getStartProperty(java.lang.String name) {
-	def value = startParameter.getProjectProperties().get('com.diffplug.spotless.include.ext')
+	def value = startParameter.getProjectProperties().get(name)
 	if(null != value) {
 		return value
 	}
@@ -61,12 +61,22 @@ def getStartProperty(java.lang.String name) {
 		userProperties.load(userPropertiesFile.newReader())
 	}
 	return userProperties.get(name)
+
 }
 
 // include external (_ext) projects from development builds
-if (getStartProperty('com.diffplug.spotless.include_ext') == 'true') {
+if (getStartProperty('com.diffplug.spotless.include.ext') == 'true') {
 	file('_ext').eachDirMatch(~/^(?!(\.|gradle)).*/) { dir ->
 		include dir.name
 		project(":${dir.name}").projectDir = dir
 	}
 }
+
+// include external (_ext) projects from development builds, but only the ones that don't need p2
+if (getStartProperty('com.diffplug.spotless.include.ext.nop2') == 'true') {
+	include 'eclipse-base'
+	project(':eclipse-base').projectDir = file('_ext/eclipse-base')
+
+	include 'eclipse-jdt'
+	project(':eclipse-jdt').projectDir = file('_ext/eclipse-jdt')
+}