From 9c666c4156e24aa3a4db198946d2f5edba46065e Mon Sep 17 00:00:00 2001
From: Crypt Keeper <64215+codefromthecrypt@users.noreply.github.com>
Date: Wed, 10 Jan 2024 08:30:23 +0800
Subject: [PATCH] ci: deploys bom separately to allow re-do on partial failure
 (#241)

Before, the bom project deployed only after the parent succeeded. This
meant a timeout would prevent it from being deployed, even if the
timeout was not critical. This deploys the bom independently so that
such a situation doesn't cause us to have to re-cut a version.

This also fixes where we didn't actually use the release args in tests.

Signed-off-by: Adrian Cole <adrian@tetrate.io>
---
 .github/workflows/deploy.yml | 12 +++++++++++-
 .github/workflows/test.yml   |  2 +-
 build-bin/README.md          |  3 +++
 build-bin/deploy             |  2 --
 build-bin/deploy_bom         |  8 ++++++++
 5 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100755 build-bin/deploy_bom

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 92d59fe5..ab0e67e4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -14,7 +14,17 @@ on:
 
 jobs:
   deploy:
+    name: deploy (${{ matrix.name }})
     runs-on: ubuntu-22.04  # newest available distribution, aka jellyfish
+    strategy:
+      fail-fast: false  # don't fail fast as we can re-run one job that failed
+      matrix:
+        include:
+          - name: jars
+            deploy_script: build-bin/deploy
+          # Deploy the Bill of Materials (BOM) separately as it is unhooked from the main project intentionally
+          - name: bom
+            deploy_script: build-bin/deploy_bom
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -51,4 +61,4 @@ jobs:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
         run: |  # GITHUB_REF will be refs/heads/master or refs/tags/MAJOR.MINOR.PATCH
           build-bin/configure_deploy &&
-          build-bin/deploy $(echo ${GITHUB_REF} | cut -d/ -f 3)
+          ${{ matrix.deploy_script }} $(echo ${GITHUB_REF} | cut -d/ -f 3)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7cef8fca..60cec5c7 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,4 +69,4 @@ jobs:
       # via forks, and login session ends up in ~/.docker. This is ok because
       # we publish DOCKER_PARENT_IMAGE to ghcr.io, hence local to the runner.
       - name: Test
-        run: build-bin/configure_test && build-bin/test
+        run: build-bin/configure_test && build-bin/test ${{ matrix.maven_args }}
diff --git a/build-bin/README.md b/build-bin/README.md
index a4f21c12..f73a21ac 100755
--- a/build-bin/README.md
+++ b/build-bin/README.md
@@ -5,6 +5,9 @@ This is a Maven project, which uses standard conventions for test and deploy.
 What's notable is that it has Docker (testcontainers) tests and that it has a Maven BOM.
 The latter implies deploy runs twice: once for the normal project modules, and again for the BOM.
 
+On deploy_bom:
+* The artifact `brave-bom` is deployed. Intentionally separate to allow a retry.
+
 [//]: # (Below here should be standard for all projects)
 
 ## Build Overview
diff --git a/build-bin/deploy b/build-bin/deploy
index 46ebac1d..e310e93b 100755
--- a/build-bin/deploy
+++ b/build-bin/deploy
@@ -5,5 +5,3 @@
 # See [README.md] for an explanation of this and how CI should use it.
 
 build-bin/maven/maven_deploy -pl -:zipkin-reporter-bom
-# Deploy the Bill of Materials (BOM) separately as it is unhooked from the main project intentionally
-build-bin/maven/maven_deploy -f bom/pom.xml
diff --git a/build-bin/deploy_bom b/build-bin/deploy_bom
new file mode 100755
index 00000000..8497fbc1
--- /dev/null
+++ b/build-bin/deploy_bom
@@ -0,0 +1,8 @@
+#!/bin/sh -ue
+
+# This script deploys a master or release version.
+#
+# See [README.md] for an explanation of this and how CI should use it.
+
+# Deploy the Bill of Materials (BOM) separately as it is unhooked from the main project intentionally
+build-bin/maven/maven_deploy -f bom/pom.xml