buildx

Author: olix0r

.github/actions/cli-setup/action.yaml

@@ -16,6 +16,6 @@ runs:
     - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0
       with:
         artifact-ids: ${{ inputs.artifact-id }}
-        path: ${{ runner.temp }/cli
-    - run: mv ${{ runner.temp }/cli/linkerd2-cli-*-linux-amd64 ${{ inputs.target }}
+        path: ${{ runner.temp }}/cli
+    - run: mv ${{ runner.temp }}/cli/linkerd2-cli-*-linux-amd64 ${{ inputs.target }}
       shell: bash

.github/workflows/cli-build.yml

@@ -8,21 +8,25 @@ on:
         type: string
         required: false
         default: 'multi-arch'
+    outputs:
+      artifact-id:
+        value: ${{ jobs.build.outputs.artifact-id }}
 
 jobs:
   build:
     runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+      - uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435
       - uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83
         id: build
         with:
-          build-arg: |
+          build-args: |
             LINKERD_VERSION=${{ inputs.version }}
           target: ${{ inputs.target }}
           context: .
-          dockerfile: cli/Dockerfile
+          file: cli/Dockerfile
           cache-from: type=gha,scope=${{ github.ref_name }}-cli
           cache-to: type=gha,mode=max,scope=${{ github.ref_name }}-cli
           push: false

.github/workflows/integration.yml

@@ -133,7 +133,8 @@ jobs:
       - uses: ./.github/actions/cli-setup
         with:
           artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-      - run: bin/tests --images archive --cleanup-docker --name ${{ matrix.test }} "$HOME/linkerd"
+          target: ${{ runner.temp }}/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name ${{ matrix.test }} ${{ runner.temp }}/linkerd
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
           TAG: ${{ needs.meta.outputs.tag }}
@@ -184,6 +185,7 @@ jobs:
       - uses: ./.github/actions/cli-setup
         with:
           artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
+          target: ${{ runner.temp }}/linkerd
       - name: Setup deps
         shell: bash
         run: |
@@ -205,7 +207,7 @@ jobs:
       - run: docker load <image-archives/policy-controller.tar
       - run: docker load <image-archives/proxy.tar
       - run: docker image ls
-      - run: just linkerd-tag='${{ needs.meta.outputs.tag }}' linkerd-exec="$HOME/linkerd" linkerd-install
+      - run: just linkerd-tag='${{ needs.meta.outputs.tag }}' linkerd-exec="${{ runner.temp }}/linkerd" linkerd-install
       - name: Load images
         run: |
           # Image loading is flakey in CI, so retry!
@@ -287,7 +289,8 @@ jobs:
       - uses: ./.github/actions/cli-setup
         with:
           artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-      - run: bin/tests --images archive --cleanup-docker --name '${{ matrix.integration_test }}' "$HOME/linkerd"
+          target: ${{ runner.temp }}/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name '${{ matrix.integration_test }}' ${{ runner.temp }}/linkerd
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
 
@@ -309,7 +312,8 @@ jobs:
       - uses: ./.github/actions/cli-setup
         with:
           artifact-id: ${{ needs.build-cli.outputs.artifact-id }}
-      - run: bin/tests --images archive --cleanup-docker --name viz "$HOME/linkerd"
+          target: ${{ runner.temp }}/linkerd
+      - run: bin/tests --images archive --cleanup-docker --name viz ${{ runner.temp }}/linkerd
         env:
           LINKERD_DOCKER_REGISTRY: ${{ env.DOCKER_REGISTRY }}
 

.github/workflows/release.yml

@@ -76,7 +76,6 @@ jobs:
 
   cli:
     needs: tag
-    if: needs.meta.outputs.changed == 'true'
     uses: ./.github/workflows/cli-build.yml
     with:
       version: ${{ needs.tag.outputs.tag }}
@@ -140,6 +139,7 @@ jobs:
     name: Create GH release
     needs:
       - tag
+      - cli
       - integration_tests
     timeout-minutes: 30
     runs-on: ${{ vars.LINKERD2_RUNNER || 'ubuntu-24.04' }}