From 4bdd921c75116c8d101450943cf8d659c7a48232 Mon Sep 17 00:00:00 2001 From: timothycarambat <rambat1010@gmail.com> Date: Mon, 27 Jan 2025 17:35:30 -0800 Subject: [PATCH] rever ubuntu arm runner - fickle and fails often --- .github/workflows/build-and-push-image-semver.yaml | 5 ++++- .github/workflows/build-and-push-image.yaml | 10 ++++++++-- .github/workflows/dev-build.yaml | 6 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-push-image-semver.yaml b/.github/workflows/build-and-push-image-semver.yaml index a723dc060..8fb6d35c2 100644 --- a/.github/workflows/build-and-push-image-semver.yaml +++ b/.github/workflows/build-and-push-image-semver.yaml @@ -11,7 +11,7 @@ on: jobs: push_multi_platform_to_registries: name: Push Docker multi-platform image to multiple registries - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest permissions: packages: write contents: read @@ -32,6 +32,9 @@ jobs: fi id: dockerhub + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 diff --git a/.github/workflows/build-and-push-image.yaml b/.github/workflows/build-and-push-image.yaml index 98aa9254c..652891b96 100644 --- a/.github/workflows/build-and-push-image.yaml +++ b/.github/workflows/build-and-push-image.yaml @@ -1,6 +1,9 @@ # This Github action is for publishing of the primary image for AnythingLLM # It will publish a linux/amd64 and linux/arm64 image at the same time # This file should ONLY BY USED FOR `master` BRANCH. +# TODO: Github now has an ubuntu-24.04-arm64 runner, but we still need +# to use QEMU to build the arm64 image because Chromium is not available for Linux arm64 +# so builds will still fail, or fail much more often. Its inconsistent and frustrating. name: Publish AnythingLLM Primary Docker image (amd64/arm64) concurrency: @@ -25,7 +28,7 @@ on: jobs: push_multi_platform_to_registries: name: Push Docker multi-platform image to multiple registries - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest permissions: packages: write contents: read @@ -46,6 +49,9 @@ jobs: fi id: dockerhub + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -125,4 +131,4 @@ jobs: $tag done done - shell: bash + shell: bash \ No newline at end of file diff --git a/.github/workflows/dev-build.yaml b/.github/workflows/dev-build.yaml index d5a45444a..4a0d90101 100644 --- a/.github/workflows/dev-build.yaml +++ b/.github/workflows/dev-build.yaml @@ -1,4 +1,4 @@ -name: AnythingLLM Development Docker image (amd64/arm64) +name: AnythingLLM Development Docker image (amd64) concurrency: group: build-${{ github.ref }} @@ -20,7 +20,7 @@ on: jobs: push_multi_platform_to_registries: name: Push Docker multi-platform image to multiple registries - runs-on: ubuntu-24.04-arm + runs-on: ubuntu-latest permissions: packages: write contents: read @@ -69,7 +69,7 @@ jobs: push: true sbom: true provenance: mode=max - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64 tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha -- GitLab