ci: deploys bom separately to allow re-do on partial failure (openzip…

…kin#1406)

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

@@ -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
@@ -57,4 +67,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)

.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 }}

build-bin/README.md

@@ -9,6 +9,9 @@ On deploy:
 * [javadoc_to_gh_pages] pushes Javadoc to the gh-pages branch on N.M.L branch, but not master.
   * gh-pages is addressable via https://zipkin.io/zipkin/
 
+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

build-bin/deploy

@@ -11,8 +11,6 @@ if [ "${version}" = "master" ]; then
 fi
 
 build-bin/maven/maven_deploy -pl -:brave-bom
-# Deploy the Bill of Materials (BOM) separately as it is unhooked from the main project intentionally
-build-bin/maven/maven_deploy -f brave-bom/pom.xml
 
 # openzipkin/brave publishes Javadoc to gh-pages (https://zipkin.io/brave/) on release
 case ${version} in

build-bin/deploy_bom

@@ -0,0 +1,4 @@
+#!/bin/sh -ue
+
+# Deploy the Bill of Materials (BOM) separately as it is unhooked from the main project intentionally
+build-bin/maven/maven_deploy -f brave-bom/pom.xml