Fix llvm-apple after #531 (#546)

Author: dliappis

.buildkite/llvm-apple-pipeline.yml

@@ -15,8 +15,8 @@ steps:
     key: "build-ubuntu-x86"
     if: build.env("BUILDKITE_PULL_REQUEST") != "false" || build.source == "ui" || build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/
     command:
-      - ".buildkite/scripts/llvm-fpm/build.sh ${MAKEFILE} ${CHANGESET_FILE} ${DOCKER_FILTER_REF}"
-      - ".buildkite/scripts/llvm-fpm/publish.sh ${MAKEFILE} ${CHANGESET_FILE}"
+      - ".buildkite/scripts/llvm-apple/build.sh ${MAKEFILE} ${CHANGESET_FILE} ${DOCKER_FILTER_REF}"
+      - ".buildkite/scripts/llvm-apple/publish.sh ${MAKEFILE} ${CHANGESET_FILE}"
     notify:
       - github_commit_status:
           context: "Build LLVM Apple / Ubuntu X86_64"
@@ -38,8 +38,8 @@ steps:
     key: "build-ubuntu-arm"
     if: build.env("BUILDKITE_PULL_REQUEST") != "false" || build.source == "ui" || build.branch == "main" || build.branch =~ /^[0-9]+\.[0-9]+$$/
     command:
-      - ".buildkite/scripts/llvm-fpm/build.sh ${MAKEFILE} ${CHANGESET_FILE} ${DOCKER_FILTER_REF}"
-      - ".buildkite/scripts/llvm-fpm/publish.sh ${MAKEFILE} ${CHANGESET_FILE}"
+      - ".buildkite/scripts/llvm-apple/build.sh ${MAKEFILE} ${CHANGESET_FILE} ${DOCKER_FILTER_REF}"
+      - ".buildkite/scripts/llvm-apple/publish.sh ${MAKEFILE} ${CHANGESET_FILE}"
     notify:
       - github_commit_status:
           context: "Build LLVM Apple / Ubuntu ARM"

.buildkite/scripts/llvm-apple/build.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common.sh
+
+makefile=${1}
+patterns=${2}
+docker_filter_ref=${3}
+
+if ! are_files_changed "$patterns" ; then
+    exit 0
+fi
+
+add_bin_path
+with_go "${GOLANG_VERSION}"
+with_mage
+
+retry 3 make -C "${makefile}" build GS_BUCKET_PATH=ingest-buildkite-ci
+docker images --format "table {{.Repository}}:{{.Tag}}\t{{.Size}}" --filter=reference="${docker_filter_ref}"

.buildkite/scripts/llvm-apple/publish.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common.sh
+
+makefile=${1}
+patterns=${2}
+
+if ! are_files_changed "$patterns" ; then
+    exit 0
+fi
+
+add_bin_path
+retry 3 make -C ${makefile} push