From c9561478ac8e71acf1194719e38b5869f9e4ae4d Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Tue, 1 Feb 2022 10:07:40 +0100
Subject: [PATCH] ci(build-cache): elixir build cache

---
 .github/workflows/build_packages.yaml   | 42 ++++++++++---------------
 scripts/docker-create-push-manifests.sh |  1 -
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml
index 72b8062ec..511c0e3c3 100644
--- a/.github/workflows/build_packages.yaml
+++ b/.github/workflows/build_packages.yaml
@@ -381,40 +381,32 @@ jobs:
         PROFILE: ${{ matrix.profile }}
         ARCH: ${{ matrix.arch }}
         SYSTEM: ${{ matrix.os }}
-      if: ${{ matrix.build_elixir == 'no_elixir' }}
       run: |
         set -eu
-        for PKGTYPE in tgz pkg;
+        # Align path for CMake caches
+        if [ ! "$PWD" = "/emqx" ]; then
+          ln -s $PWD /emqx
+          cd /emqx
+        fi
+        echo "pwd is $PWD"
+        PkgTypes="tgz pkg"
+        WithElixir=""
+        if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then
+          PkgTypes="tgz"
+          # set Elixir build flag
+          WithElixir="--with-elixir"
+        fi
+        for PKGTYPE in ${PkgTypes};
         do
           ./scripts/buildx.sh \
             --profile "${PROFILE}" \
             --pkgtype "${PKGTYPE}" \
             --arch "${ARCH}" \
             --otp "${OTP}" \
-            --elixir "${ELIXIR}" \
+            --elixir "${ELIXIR}" "$WithElixir" \
             --system "${SYSTEM}" \
             --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
         done
-    - name: build emqx packages (Elixir)
-      env:
-        OTP: ${{ matrix.otp }}
-        ELIXIR: ${{ matrix.elixir }}
-        PROFILE: ${{ matrix.profile }}
-        ARCH: ${{ matrix.arch }}
-        SYSTEM: ${{ matrix.os }}
-      working-directory: source
-      if: ${{ matrix.build_elixir == 'with_elixir' }}
-      run: |
-        ## we currently only build tgzs for elixir
-        ./scripts/buildx.sh \
-          --profile "${PROFILE}" \
-          --pkgtype "tgz" \
-          --arch "${ARCH}" \
-          --otp "${OTP}" \
-          --elixir "${ELIXIR}" \
-          --system "${SYSTEM}" \
-          --with-elixir \
-          --builder "ghcr.io/emqx/emqx-builder/5.0-5:${ELIXIR}-${OTP}-${SYSTEM}"
 
     - name: create sha256
       env:
@@ -512,7 +504,7 @@ jobs:
 
         if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then
           emqx_name="emqx-elixir"
-          img_suffix="elixir-{{ matrix.arch }}"
+          img_suffix="elixir-${{ matrix.arch }}"
           img_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}\n${img_labels}"
         fi
         echo "::set-output name=img::${img}"
@@ -653,7 +645,7 @@ jobs:
 
           if [ ${{ matrix.build_elixir }} = "with_elixir" ]; then
             emqx_name="emqx-elixir"
-            img_suffix="elixir-{{ matrix.arch }}"
+            img_suffix="elixir-${{ matrix.arch }}"
             img_labels="org.opencontainers.image.elixir.version=${{ matrix.elixir }}\n$img_labels"
           fi
           echo "::set-output name=img::${img}"
diff --git a/scripts/docker-create-push-manifests.sh b/scripts/docker-create-push-manifests.sh
index cb4643a13..e0cb81520 100755
--- a/scripts/docker-create-push-manifests.sh
+++ b/scripts/docker-create-push-manifests.sh
@@ -19,7 +19,6 @@ docker manifest push "${img_march}"
 
 # PUSH latest if it is a release build
 if [ "$IsPushLatest" = "true" ]; then
-
     img_latest=$(echo "$img_arm64" | cut -d: -f 1):latest
     docker manifest create "${img_latest}" \
         --amend "$img_amd64_digest" \