From 0ca0288a8f1a5f1b1228d785dbfce1d272837c05 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Tue, 15 Apr 2025 12:52:00 -0700 Subject: [PATCH 1/3] bump buildx due to GHA cache deprecation --- .github/workflows/build-and-push-image.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push-image.yaml b/.github/workflows/build-and-push-image.yaml index f111e2a0e44..97d051061a2 100644 --- a/.github/workflows/build-and-push-image.yaml +++ b/.github/workflows/build-and-push-image.yaml @@ -62,7 +62,7 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - version: v0.19.0 + version: v0.22.0 - name: Log in to Docker Hub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a From 5252672b7e3c86fda81f2e172205f8ceba790c30 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Tue, 15 Apr 2025 12:53:19 -0700 Subject: [PATCH 2/3] try arm64 build with new buildx version --- .github/workflows/dev-build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml index 7c6b0cc0561..0e04cc7eb2b 100644 --- a/.github/workflows/dev-build.yaml +++ b/.github/workflows/dev-build.yaml @@ -6,7 +6,7 @@ concurrency: on: push: - branches: ['3536-feat-new-chat-home-page'] # put your current branch to create a build. Core team only. + branches: ['buildx-bump'] # put your current branch to create a build. Core team only. paths-ignore: - '**.md' - 'cloud-deployments/*' @@ -45,13 +45,13 @@ jobs: id: dockerhub # Uncomment this + add linux/arm64 to platforms if you want to build for arm64 as well - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - version: v0.19.0 + version: v0.22.0 - name: Log in to Docker Hub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a @@ -78,8 +78,8 @@ jobs: push: true sbom: true provenance: mode=max - platforms: linux/amd64 - # platforms: linux/amd64,linux/arm64 + # platforms: linux/amd64 + platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha From d487cc1b4f3a8a267edd4d5418d67988da9cdd49 Mon Sep 17 00:00:00 2001 From: timothycarambat Date: Tue, 15 Apr 2025 14:11:38 -0700 Subject: [PATCH 3/3] verify new version working for buildx --- .github/workflows/build-and-push-image-semver.yaml | 7 +------ .github/workflows/build-and-push-image.yaml | 5 ----- .github/workflows/dev-build.yaml | 10 +++++----- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-and-push-image-semver.yaml b/.github/workflows/build-and-push-image-semver.yaml index e922d91bdde..1da1dda9df3 100644 --- a/.github/workflows/build-and-push-image-semver.yaml +++ b/.github/workflows/build-and-push-image-semver.yaml @@ -35,15 +35,10 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 - # Since Docker Buildx v20.1 - segfaults occur on arm64 with ubuntu-latest. - # So we pin to v0.19.0 for now until the issue is resolved for runners via QEMU. - # Alternatively, we can move to ARM runners and remove the QEMU setup, but this previously - # has issues (see comment at the top) - # https://github.com/NVIDIA/cuda-quantum/pull/2651#issue-2870353124 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: - version: v0.19.0 + version: v0.22.0 - name: Log in to Docker Hub uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a diff --git a/.github/workflows/build-and-push-image.yaml b/.github/workflows/build-and-push-image.yaml index 97d051061a2..2519d1362d9 100644 --- a/.github/workflows/build-and-push-image.yaml +++ b/.github/workflows/build-and-push-image.yaml @@ -54,11 +54,6 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v3 - # Since Docker Buildx v20.1 - segfaults occur on arm64 with ubuntu-latest. - # So we pin to v0.19.0 for now until the issue is resolved for runners via QEMU. - # Alternatively, we can move to ARM runners and remove the QEMU setup, but this previously - # has issues (see comment at the top) - # https://github.com/NVIDIA/cuda-quantum/pull/2651#issue-2870353124 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 with: diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml index 0e04cc7eb2b..dd628949db5 100644 --- a/.github/workflows/dev-build.yaml +++ b/.github/workflows/dev-build.yaml @@ -6,7 +6,7 @@ concurrency: on: push: - branches: ['buildx-bump'] # put your current branch to create a build. Core team only. + branches: ['na'] # put your current branch to create a build. Core team only. paths-ignore: - '**.md' - 'cloud-deployments/*' @@ -45,8 +45,8 @@ jobs: id: dockerhub # Uncomment this + add linux/arm64 to platforms if you want to build for arm64 as well - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 + # - name: Set up QEMU + # uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -78,8 +78,8 @@ jobs: push: true sbom: true provenance: mode=max - # platforms: linux/amd64 - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 + # platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha