Merge pull request #514 from MarathonLabs/feat/release-batching

feat(ci): assemble before publishing to batch artifacts in sonatype
MarathonLabs · Jun 6, 2021 · 4e35082 · 4e35082
2 parents 4b2fc10 + 94dd45b
commit 4e35082
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/.buildsystem/deploy-github.sh b/.buildsystem/deploy-github.sh
@@ -16,14 +16,17 @@ if [ -z "$GPG_PASSPHRASE" ]; then
   exit 1
 fi
 
-TARGETS=""
+ASSEMBLE_TARGETS=""
+PUBLISH_TARGETS=""
 for i in ":core" ":vendor:vendor-android:base" ":vendor:vendor-android:ddmlib" ":vendor:vendor-android:adam" ":marathon-gradle-plugin" ":report:execution-timeline" ":report:html-report" ":analytics:usage"; do
-  TARGETS="$TARGETS $i:publishDefaultPublicationToGitHubRepository"
+  ASSEMBLE_TARGETS="$ASSEMBLE_TARGETS $i:assemble"
+  PUBLISH_TARGETS="$PUBLISH_TARGETS $i:publishDefaultPublicationToGitHubRepository"
 done
 
 if [ -n "$GIT_TAG_NAME" ]; then
   echo "on a tag -> deploy release version $GIT_TAG_NAME"
-  ./gradlew $TARGETS -PreleaseMode=RELEASE
+  ./gradlew $ASSEMBLE_TARGETS -PreleaseMode=RELEASE
+  ./gradlew $PUBLISH_TARGETS -PreleaseMode=RELEASE
 else
   echo "not on a tag -> skipping deployment to GitHub"
 fi
diff --git a/.buildsystem/deploy-sonatype.sh b/.buildsystem/deploy-sonatype.sh
@@ -16,15 +16,19 @@ if [ -z "$GPG_PASSPHRASE" ]; then
   exit 1
 fi
 
-TARGETS=""
+ASSEMBLE_TARGETS=""
+PUBLISH_TARGETS=""
 for i in ":core" ":vendor:vendor-android:base" ":vendor:vendor-android:ddmlib" ":vendor:vendor-android:adam" ":marathon-gradle-plugin" ":report:execution-timeline" ":report:html-report" ":analytics:usage"; do
-  TARGETS="$TARGETS $i:publishDefaultPublicationToOSSHRRepository"
+  ASSEMBLE_TARGETS="$ASSEMBLE_TARGETS $i:assemble"
+  PUBLISH_TARGETS="$PUBLISH_TARGETS $i:publishDefaultPublicationToOSSHRRepository"
 done
 
 if [ -z "$GIT_TAG_NAME" ]; then
   echo "not on a tag -> deploy snapshot version"
-  ./gradlew $TARGETS -PreleaseMode=SNAPSHOT
+  ./gradlew $ASSEMBLE_TARGETS -PreleaseMode=SNAPSHOT
+  ./gradlew $PUBLISH_TARGETS -PreleaseMode=SNAPSHOT
 else
   echo "on a tag -> deploy release version $GIT_TAG_NAME"
-  ./gradlew $TARGETS -PreleaseMode=RELEASE
+  ./gradlew $ASSEMBLE_TARGETS -PreleaseMode=RELEASE
+  ./gradlew $PUBLISH_TARGETS -PreleaseMode=RELEASE
 fi