Optimize rockcraft build (#15)

canonical · Aug 19, 2024 · 00040a7 · 00040a7
1 parent 5e47670
commit 00040a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -15,7 +15,7 @@ jobs:
       multiarch-awareness: true
       cache-action: "skip"
       # pinning to use rockcraft 1.3.0 feature `entrypoint-service`
-      rockcraft-revisions: '{"amd64": "1783", "arm64": "1784"}'
+      rockcraft-revisions: '{"amd64": "2218", "arm64": "2222"}'
       arch-skipping-maximize-build-space: '["arm64", "amd64"]'
       platform-labels: '{"amd64": ["self-hosted", "Linux", "X64", "jammy", "xlarge"], "arm64": ["self-hosted", "Linux", "ARM64", "jammy", "large"]}'
   run-tests:
@@ -36,6 +36,7 @@ jobs:
     name: Combine Rocks and Push Multiarch Manifest
     uses: canonical/k8s-workflows/.github/workflows/assemble_multiarch_image.yaml@main
     needs: [build-and-push-arch-specifics]
+    if: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas != '[]' }}
     with:
-      rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.rock-metas }}
+      rock-metas: ${{ needs.build-and-push-arch-specifics.outputs.changed-rock-metas }}
       dry-run: ${{ github.event_name != 'push' }}
diff --git a/1.28.2/rockcraft.yaml b/1.28.2/rockcraft.yaml
@@ -57,7 +57,7 @@ parts:
       if [ "${arch}" == "x86_64" ]; then
           clang_llvm="clang+llvm-18.1.8-x86_64-linux-gnu-ubuntu-18.04"
       elif [ "${arch}" == "aarch64" ]; then
-          clang_llvm="clang+llvm-18.1.8-aarch64-linux-gnu.tar.xz"
+          clang_llvm="clang+llvm-18.1.8-aarch64-linux-gnu"
       else
         echo "Invalid platform for building envoy ('${arch}'). Exiting."
         exit 1